Merge pull request #41 from akirak/elixir-dep-style

style: Use beam packages via beamPackages binding
akirak · Jul 2, 2023 · 9c8a399 · 9c8a399
2 parents b60d05c + caab5a2
commit 9c8a399
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/elixir-phoenix/flake.nix b/elixir-phoenix/flake.nix
@@ -25,12 +25,13 @@
         };
 
         # Set the Erlang version
-        erlangVersion = "erlangR26";
+        erlangVersion = "erlangR25";
         # Set the Elixir version
         elixirVersion = "elixir_1_14";
+
         erlang = pkgs.beam.interpreters.${erlangVersion};
-        elixir = pkgs.beam.packages.${erlangVersion}.${elixirVersion};
-        elixir-ls = pkgs.beam.packages.${erlangVersion}.elixir-ls;
+        beamPackages = pkgs.beam.packages.${erlangVersion};
+        elixir = beamPackages.${elixirVersion};
 
         inherit (pkgs.lib) optional optionals;
 
@@ -57,7 +58,7 @@
             [
               erlang
               elixir
-              elixir-ls
+              beamPackages.elixir-ls
             ]
             ++ (with pkgs; [
               nodejs

diff --git a/elixir/flake.nix b/elixir/flake.nix
@@ -12,13 +12,13 @@
         };
 
         # Set the Erlang version
-        erlangVersion = "erlangR26";
+        erlangVersion = "erlangR25";
         # Set the Elixir version
         elixirVersion = "elixir_1_14";
 
         erlang = pkgs.beam.interpreters.${erlangVersion};
-        elixir = pkgs.beam.packages.${erlangVersion}.${elixirVersion};
-        elixir-ls = pkgs.beam.packages.${erlangVersion}.elixir-ls;
+        beamPackages = pkgs.beam.packages.${erlangVersion};
+        elixir = beamPackages.${elixirVersion};
       in rec {
         # TODO: Add your Elixir package
         # packages = flake-utils.lib.flattenTree {
@@ -28,7 +28,7 @@
           buildInputs = [
             erlang
             elixir
-            elixir-ls
+            beamPackages.elixir-ls
           ];
         };
       }