Skip to content

Commit aa3bc3d

Browse files
committed
Eliminate the substituter mechanism
Substitution is now simply a Store -> Store copy operation, most typically from BinaryCacheStore to LocalStore.
1 parent 21e9d18 commit aa3bc3d

File tree

16 files changed

+166
-597
lines changed

16 files changed

+166
-597
lines changed

scripts/local.mk

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,13 @@ nix_bin_scripts := \
77

88
bin-scripts += $(nix_bin_scripts)
99

10-
nix_substituters := \
11-
$(d)/copy-from-other-stores.pl \
12-
$(d)/download-from-binary-cache.pl
13-
1410
nix_noinst_scripts := \
1511
$(d)/build-remote.pl \
1612
$(d)/find-runtime-roots.pl \
1713
$(d)/resolve-system-dependencies.pl \
1814
$(d)/nix-http-export.cgi \
1915
$(d)/nix-profile.sh \
20-
$(d)/nix-reduce-build \
21-
$(nix_substituters)
16+
$(d)/nix-reduce-build
2217

2318
noinst-scripts += $(nix_noinst_scripts)
2419

@@ -28,7 +23,6 @@ $(eval $(call install-file-as, $(d)/nix-profile.sh, $(profiledir)/nix.sh, 0644))
2823
$(eval $(call install-program-in, $(d)/find-runtime-roots.pl, $(libexecdir)/nix))
2924
$(eval $(call install-program-in, $(d)/build-remote.pl, $(libexecdir)/nix))
3025
$(eval $(call install-program-in, $(d)/resolve-system-dependencies.pl, $(libexecdir)/nix))
31-
$(foreach prog, $(nix_substituters), $(eval $(call install-program-in, $(prog), $(libexecdir)/nix/substituters)))
3226
$(eval $(call install-symlink, nix-build, $(bindir)/nix-shell))
3327

3428
clean-files += $(nix_bin_scripts) $(nix_noinst_scripts)

0 commit comments

Comments
 (0)