mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2024-12-15 17:51:01 +00:00
Code Activity

nix: use old default for nix.nixPath with system.stateVersion = 1

Browse source
This commit is contained in:
Daiderd Jordan 2017-10-01 16:26:13 +02:00
parent c8cc548dfc
commit d3941dc5ec
No known key found for this signature in database
GPG key ID: D02435D05B810C96
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG
View file

@ -11,7 +11,8 @@
programs.nix-index.enable = true; programs.nix-index.enable = true;
2017-07-23 2017-07-23
- darwin entry in the default nix.nixPath was removed - darwin entry in the default nix.nixPath was removed for
system.stateVersion > 1
Use a channel for nix-darwin or configure nix.nixPath Use a channel for nix-darwin or configure nix.nixPath

6
modules/nix/default.nix
View file

@ -304,6 +304,12 @@ in
nix.binaryCaches = mkAfter [ https://cache.nixos.org/ ]; nix.binaryCaches = mkAfter [ https://cache.nixos.org/ ];
nix.binaryCachePublicKeys = mkAfter [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ]; nix.binaryCachePublicKeys = mkAfter [ "cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=" ];
nix.nixPath = 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"
]);
environment.etc."nix/nix.conf".source = nixConf; environment.etc."nix/nix.conf".source = nixConf;
# List of machines for distributed Nix builds in the format # List of machines for distributed Nix builds in the format