From 58aa5bf1850a4dea4c1c2bd1d0f30e17c05a2c86 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Wed, 1 May 2019 12:42:31 +0200 Subject: nix: make nix.nixPath merge by default Since named entries can be overridden now based on ordering now merging is only a problem for removing one of the default search paths, in which case a higher priority eg. mkForce can be used. { nix.nixPath = [{ darwin-config = "/darwin.nix"; }]; } Will result in [ "darwin-config=/darwin.nix" "/nix/var/nix/profiles/per-user/root/channels" "$HOME/.nix-defexpr/channels" ] Fixes #137 --- modules/examples/ofborg.nix | 2 +- modules/examples/simple.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/examples') diff --git a/modules/examples/ofborg.nix b/modules/examples/ofborg.nix index 7316905..528a8fd 100644 --- a/modules/examples/ofborg.nix +++ b/modules/examples/ofborg.nix @@ -25,7 +25,7 @@ with lib; # Used for backwards compatibility, please read the changelog before changing. # $ darwin-rebuild changelog - system.stateVersion = 3; + system.stateVersion = 4; # You should generally set this to the total number of logical cores in your system. # $ sysctl -n hw.ncpu diff --git a/modules/examples/simple.nix b/modules/examples/simple.nix index 1efbdb2..3a60df9 100644 --- a/modules/examples/simple.nix +++ b/modules/examples/simple.nix @@ -22,7 +22,7 @@ # Used for backwards compatibility, please read the changelog before changing. # $ darwin-rebuild changelog - system.stateVersion = 3; + system.stateVersion = 4; # You should generally set this to the total number of logical cores in your system. # $ sysctl -n hw.ncpu -- cgit v1.2.3