move global overrides after local package derivation overrides

tek · Jul 29, 2023 · 0a50cf1 · 0a50cf1
1 parent fa6af31
commit 0a50cf1
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 13 deletions.
diff --git a/lib/with-config.nix b/lib/with-config.nix
@@ -17,17 +17,9 @@ let
   overridesFromDeps = extra:
   util.concatOverrides (map overridesDeps extra);
 
-  overridesGlobal = extra:
-  util.concatOverrides [
-    (overridesFromDeps (["local" "all"] ++ extra))
-    config.overrides
-  ];
-
-  overridesGlobalMin = extra:
-  util.concatOverrides [
-    (overridesFromDeps (["localMin" "all"] ++ extra))
-    config.overrides
-  ];
+  overridesGlobal = extra: overridesFromDeps (["local" "all"] ++ extra);
+
+  overridesGlobalMin = extra: overridesFromDeps (["localMin" "all"] ++ extra);
 
   json = let
 

diff --git a/modules/env.nix b/modules/env.nix
@@ -233,7 +233,12 @@ in {
     };
 
     buildInputs = mkOption {
-      description = mdDoc "Additional system package dependencies for this environment.";
+      description = mdDoc ''
+      Additional system package dependencies for this environment.
+      ::: {.note}
+      These are only made available to shells and commands, not added to packages, like when they are set in overrides.
+      :::
+      '';
       type = either (functionTo (listOf package)) (listOf package);
       default = [];
     };
@@ -525,6 +530,7 @@ in {
         util.concatOverrides [
           config.internal.overridesInherited
           config.internal.overridesLocal
+          global.overrides
           config.overrides
         ]
         );

diff --git a/test/overrides/root/flake.nix b/test/overrides/root/flake.nix
@@ -11,12 +11,17 @@
       src = ./.;
       library.enable = true;
       cabal.dependencies = ["aeson" "extra" "dep"];
+      test = {
+        enable = true;
+        dependencies = ["typed-process"];
+      };
     };
     compat.enable = false;
-    overrides = {self, hackage, jailbreak, ...}: {
+    overrides = {self, pkgs, hackage, jailbreak, buildInputs, ...}: {
       aeson = hackage "2.1.2.1" "1f1f6h2r60ghz4p1ddi6wnq6z3i07j60sgm77hx2rvmncz4vizp0";
       extra = jailbreak;
       root1 = jailbreak self.root;
+      root = buildInputs [pkgs.git];
     };
     gen-overrides.enable = true;
   });

diff --git a/test/overrides/root/test/Main.hs b/test/overrides/root/test/Main.hs
@@ -0,0 +1,7 @@
+module Main where
+
+import Data.Functor (void)
+import System.Process.Typed (readProcess, proc)
+
+main :: IO ()
+main = void (readProcess (proc "git" []))