diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2019-05-01 12:42:31 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2019-05-01 12:42:31 +0200 |
| commit | 58aa5bf1850a4dea4c1c2bd1d0f30e17c05a2c86 (patch) | |
| tree | e4d784af634d7ccdfbd1aab2c2f4207caf2aa668 /modules | |
| parent | 4d235b800d2add9adba90686bcadbf4f1beb5d9c (diff) | |
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
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/examples/ofborg.nix | 2 | ||||
| -rw-r--r-- | modules/examples/simple.nix | 2 | ||||
| -rw-r--r-- | modules/nix/default.nix | 11 | ||||
| -rw-r--r-- | modules/system/version.nix | 2 |
4 files changed, 12 insertions, 5 deletions
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 diff --git a/modules/nix/default.nix b/modules/nix/default.nix index 9db2371..b4fdff4 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -363,11 +363,18 @@ in nix.binaryCaches = mkAfter [ https://cache.nixos.org/ ]; nix.binaryCachePublicKeys = mkAfter [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ]; - nix.nixPath = mkIf (config.system.stateVersion < 2) (mkDefault + nix.nixPath = mkMerge [ + (mkIf (config.system.stateVersion < 2) (mkDefault [ "darwin=$HOME/.nix-defexpr/darwin" "darwin-config=$HOME/.nixpkgs/darwin-configuration.nix" "/nix/var/nix/profiles/per-user/root/channels" - ]); + ])) + (mkIf (config.system.stateVersion > 3) (mkOrder 1200 + [ { darwin-config = "${config.environment.darwinConfig}"; } + "/nix/var/nix/profiles/per-user/root/channels" + "$HOME/.nix-defexpr/channels" + ])) + ]; nix.package = mkIf (config.system.stateVersion < 3) diff --git a/modules/system/version.nix b/modules/system/version.nix index edaf19b..ee38388 100644 --- a/modules/system/version.nix +++ b/modules/system/version.nix @@ -26,7 +26,7 @@ in options = { system.stateVersion = mkOption { type = types.int; - default = 3; + default = 4; description = '' Every once in a while, a new NixOS release may change configuration defaults in a way incompatible with stateful |