mirrors/nix-darwin
mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2025-03-05 16:27:03 +00:00
Code Activity

nix: use pkgs.nix by default instead of the default profile

Browse source 
This fixes version detection for 2.0.
This commit is contained in:
Daiderd Jordan 2018-03-29 21:00:49 +02:00
parent 4899b6658f
commit cd049bfdf6
No known key found for this signature in database
GPG key ID: D02435D05B810C96
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
modules/nix/default.nix
View file

@ -53,10 +53,14 @@ in
options = { options = {
nix.package = mkOption { nix.package = mkOption {
type = types.either types.package types.path; type = types.either types.package types.path;
default = "/nix/var/nix/profiles/default"; default = pkgs.nix;
example = "pkgs.nix"; defaultText = "pkgs.nix";
example = "pkgs.nixUnstable";
description = '' description = ''
This option specifies the package or profile that contains the version of Nix to use throughout the system. This option specifies the package or profile that contains the version of Nix to use throughout the system.
To keep the version of nix originally installed the default profile can be used.
eg. /nix/var/nix/profiles/default
''; '';
}; };
@ -331,6 +335,9 @@ in
"/nix/var/nix/profiles/per-user/root/channels" "/nix/var/nix/profiles/per-user/root/channels"
]); ]);
nix.package = mkIf (config.system.stateVersion < 3)
"/nix/var/nix/profiles/default";
environment.systemPackages = mkIf (isDerivation cfg.package) environment.systemPackages = mkIf (isDerivation cfg.package)
[ cfg.package ]; [ cfg.package ];

2
modules/system/version.nix
View file

@ -18,7 +18,7 @@ in
options = { options = {
system.stateVersion = mkOption { system.stateVersion = mkOption {
type = types.int; type = types.int;
default = 2; default = 3;
description = '' description = ''
Every once in a while, a new NixOS release may change Every once in a while, a new NixOS release may change
configuration defaults in a way incompatible with stateful configuration defaults in a way incompatible with stateful