Merge remote-tracking branch 'origin/master' into fix-stackage

input-output-hk · Mar 27, 2023 · b30de01 · b30de01
2 parents 8c11016 + 1dcbcc7
commit b30de01
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/hix/init/flake.nix b/hix/init/flake.nix
@@ -19,7 +19,8 @@
             hixProject =
               final.haskell-nix.hix.project {
                 src = ./.;
-                evalSystem = "EVAL_SYSTEM";
+                # uncomment with your current system for `nix flake show` to work:
+                #evalSystem = "EVAL_SYSTEM";
               };
           })
         ];

diff --git a/nix-tools/flake.nix b/nix-tools/flake.nix
@@ -17,7 +17,6 @@
             hixProject =
               final.haskell-nix.hix.project {
                 src = ./.;
-                evalSystem = "x86_64-darwin";
                 compiler-nix-name = __head compilers;
               };
           })

diff --git a/overlays/hix.nix b/overlays/hix.nix
@@ -35,7 +35,7 @@ final: prev: { haskell-nix = prev.haskell-nix // { hix = {
           then {}
           else import src;
       projectDefaults = importDefaults (toString (src.origSrcSubDir or src) + "/nix/hix.nix");
-    in final.haskell-nix.project [
+    in final.haskell-nix.project' [
             (import ../modules/hix-project.nix)
             projectDefaults
             commandArgs'