From 58aa5bf1850a4dea4c1c2bd1d0f30e17c05a2c86 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
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/system/version.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/system')

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
-- 
cgit v1.2.3