Merge pull request #159662 from polykernel/nix-fix-substituters-merging-order

nixos/nix-daemon: Fix merging order for substituters option
This commit is contained in:
Domen Kožar
2022-02-21 07:24:32 +01:00
committed by GitHub

View File

@@ -762,7 +762,7 @@ in
nix.settings = mkMerge [ nix.settings = mkMerge [
{ {
trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ]; trusted-public-keys = [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
substituters = [ "https://cache.nixos.org/" ]; substituters = mkAfter [ "https://cache.nixos.org/" ];
system-features = mkDefault ( system-features = mkDefault (
[ "nixos-test" "benchmark" "big-parallel" "kvm" ] ++ [ "nixos-test" "benchmark" "big-parallel" "kvm" ] ++