Skip to content

Commit 3880e26

Browse files
committed
also patch kevm-pyk src to make cachix build match usual nix build
1 parent b3de342 commit 3880e26

1 file changed

Lines changed: 15 additions & 7 deletions

File tree

flake.nix

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,16 +54,15 @@
5454

5555
src = prev.stdenv.mkDerivation {
5656
name = "kevm-${self.rev or "dirty"}-src";
57-
src = prev.lib.cleanSource
58-
(prev.nix-gitignore.gitignoreSourcePure [
57+
src = final.lib.cleanSource
58+
(final.nix-gitignore.gitignoreSourcePure [
5959
./.gitignore
6060
".github/"
6161
"result*"
6262
"*.nix"
63-
"deps/"
6463
"kevm-pyk/"
65-
# submodule directories are initilized empty by git, but
66-
# not included by nix flakes/nix CLI
64+
# do not include submodule directories that might be initilized empty or non-existent
65+
"/deps/"
6766
"/tests/ethereum-tests"
6867
"/web/k-web-theme"
6968
] ./.);
@@ -130,7 +129,13 @@
130129

131130
kevm-pyk = poetry2nix.mkPoetryApplication {
132131
python = prev.python310;
133-
projectDir = ./kevm-pyk;
132+
projectDir = final.lib.cleanSource (
133+
final.nix-gitignore.gitignoreSourcePure [
134+
./.gitignore
135+
# do not include submodule directories that might be initilized empty or non-existent
136+
"/src/kevm_pyk/kproj/plugin"
137+
] ./kevm-pyk/.
138+
);
134139
overrides = poetry2nix.overrides.withDefaults
135140
(finalPython: prevPython: {
136141
kframework = prev.pyk-python310;
@@ -204,8 +209,11 @@
204209
".github/"
205210
"result*"
206211
"*.nix"
207-
"deps/"
208212
"kevm-pyk/"
213+
# do not include submodule directories that might be initilized empty or non-existent
214+
"/deps/"
215+
"/tests/ethereum-tests"
216+
"/web/k-web-theme"
209217
] ./.);
210218
};
211219

0 commit comments

Comments
 (0)