fix: correctly extend devShells

Signed-off-by: Roman Volosatovs <[email protected]>
rvolosatovs · Feb 6, 2025 · 21c0920 · 21c0920
1 parent 3d42e14
commit 21c0920
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/lib/extendDerivations.nix b/lib/extendDerivations.nix
@@ -9,9 +9,7 @@ with builtins;
   buildInputs ? [ ],
   depsBuildBuild ? [ ],
   env ? null,
-  inputsFrom ? [ ],
   nativeBuildInputs ? [ ],
-  packages ? [ ],
 }:
 mapAttrs (
   n: v:
@@ -20,9 +18,7 @@ mapAttrs (
     {
       buildInputs = (attrs.buildInputs or [ ]) ++ buildInputs;
       depsBuildBuild = (attrs.depsBuildBuild or [ ]) ++ depsBuildBuild;
-      inputsFrom = (attrs.inputsFrom or [ ]) ++ inputsFrom;
       nativeBuildInputs = (attrs.nativeBuildInputs or [ ]) ++ nativeBuildInputs;
-      packages = (attrs.packages or [ ]) ++ packages;
     }
     // optionalAttrs (env != null) {
       env = (attrs.env or { }) // env;

diff --git a/lib/rust/mkFlake.nix b/lib/rust/mkFlake.nix
@@ -155,7 +155,7 @@ self.lib.mkFlake {
       // {
         devShells = extendDerivations (
           {
-            packages = [
+            nativeBuildInputs = [
               attrs.hostRustToolchain
             ];
           }