Skip to content

Commit 1dcbcc7

Browse files
authored
hix: use project' for lazier flake and no hardcoding evalSystem (#1893)
hard-coding a particular `evalSystem` is not portable, and removing `evalSystem` forced users to have builders for each supported system. (with this commit `evalSystem` is now only necessary for `nix flake show`)
1 parent 0065fcc commit 1dcbcc7

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

hix/init/flake.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
hixProject =
2020
final.haskell-nix.hix.project {
2121
src = ./.;
22-
evalSystem = "EVAL_SYSTEM";
22+
# uncomment with your current system for `nix flake show` to work:
23+
#evalSystem = "EVAL_SYSTEM";
2324
};
2425
})
2526
];

nix-tools/flake.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
hixProject =
1818
final.haskell-nix.hix.project {
1919
src = ./.;
20-
evalSystem = "x86_64-darwin";
2120
compiler-nix-name = __head compilers;
2221
};
2322
})

overlays/hix.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ final: prev: { haskell-nix = prev.haskell-nix // { hix = {
3535
then {}
3636
else import src;
3737
projectDefaults = importDefaults (toString (src.origSrcSubDir or src) + "/nix/hix.nix");
38-
in final.haskell-nix.project [
38+
in final.haskell-nix.project' [
3939
(import ../modules/hix-project.nix)
4040
projectDefaults
4141
commandArgs'

0 commit comments

Comments
 (0)