summaryrefslogtreecommitdiff
path: root/modules/system
diff options
context:
space:
mode:
authorDaiderd Jordan <daiderd@gmail.com>2019-05-01 12:42:31 +0200
committerDaiderd Jordan <daiderd@gmail.com>2019-05-01 12:42:31 +0200
commit58aa5bf1850a4dea4c1c2bd1d0f30e17c05a2c86 (patch)
treee4d784af634d7ccdfbd1aab2c2f4207caf2aa668 /modules/system
parent4d235b800d2add9adba90686bcadbf4f1beb5d9c (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/system')
-rw-r--r--modules/system/version.nix2
1 files changed, 1 insertions, 1 deletions
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