Skip to content

Commit cea3a0c

Browse files
committed
Remove support for local overrides
Local overrides ruin binary caching.
1 parent 3fd34f9 commit cea3a0c

File tree

2 files changed

+24
-35
lines changed

2 files changed

+24
-35
lines changed

default.nix

Lines changed: 23 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -14,36 +14,30 @@ let
1414
in import haskell-nix.sources.nixpkgs-2003 args;
1515
inherit (pkgs) lib;
1616

17-
local =
18-
if builtins.pathExists ./local.nix
19-
then import ./local.nix { inherit default; }
20-
else x: x;
21-
22-
project =
23-
(args: pkgs.haskell-nix.stackProject (local args)) {
24-
src = pkgs.haskell-nix.haskellLib.cleanGit { name = "kore"; src = ./.; };
25-
modules = [
26-
{
27-
# package *
28-
enableLibraryProfiling = true;
29-
profilingDetail = "none";
30-
# package kore
31-
packages.kore = {
32-
flags = {
33-
inherit release threaded;
34-
};
35-
enableLibraryProfiling = profiling;
36-
enableExecutableProfiling = profiling;
37-
profilingDetail = "toplevel-functions";
38-
39-
# Add Z3 to PATH for unit tests.
40-
components.tests.kore-test.preCheck = ''
41-
export PATH="$PATH''${PATH:+:}${lib.getBin pkgs.z3}/bin"
42-
'';
17+
project = pkgs.haskell-nix.stackProject {
18+
src = pkgs.haskell-nix.haskellLib.cleanGit { name = "kore"; src = ./.; };
19+
modules = [
20+
{
21+
# package *
22+
enableLibraryProfiling = true;
23+
profilingDetail = "none";
24+
# package kore
25+
packages.kore = {
26+
flags = {
27+
inherit release threaded;
4328
};
44-
}
45-
];
46-
};
29+
enableLibraryProfiling = profiling;
30+
enableExecutableProfiling = profiling;
31+
profilingDetail = "toplevel-functions";
32+
33+
# Add Z3 to PATH for unit tests.
34+
components.tests.kore-test.preCheck = ''
35+
export PATH="$PATH''${PATH:+:}${lib.getBin pkgs.z3}/bin"
36+
'';
37+
};
38+
}
39+
];
40+
};
4741

4842
shell = import ./shell.nix { inherit default; };
4943

shell.nix

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,7 @@
22

33
let
44
inherit (default) project;
5-
6-
local =
7-
if builtins.pathExists ./shell.local.nix
8-
then import ./shell.local.nix { inherit default; }
9-
else x: x;
10-
shellFor = args: project.shellFor (local args);
5+
inherit (project) shellFor;
116

127
sources = import ./nix/sources.nix;
138
pkgs = import sources."nixpkgs" {};

0 commit comments

Comments
 (0)