nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-11 07:23:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

* Use Nix 0.11.

Browse Source 
svn path=/nixos/trunk/; revision=10048
This commit is contained in:
Eelco Dolstra 2008-01-02 13:05:24 +00:00
parent 0cb6f3e5c3
commit 5ec82632f2
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
system/options.nix
View File

@ -1768,22 +1768,22 @@ root ALL=(ALL) SETENV: ALL
}; };
nix = mkOption { nix = mkOption {
default = pkgs: pkgs.nixUnstable; default = pkgs: pkgs.nix;
example = pkgs: pkgs.nixCustomFun /root/nix.tar.gz; example = pkgs: pkgs.nixCustomFun /root/nix.tar.gz;
description = " description = ''
Use non-default Nix easily. Be careful, though, not to break everything. Use non-default Nix easily. Be careful, though, not to break everything.
"; '';
}; };
}; };
nesting = { nesting = {
children = mkOption { children = mkOption {
default = []; default = [];
description = " description = ''
Additional configurations to build. Additional configurations to build.
"; '';
}; };
}; };
} }

2
system/system.nix
View File

@ -31,7 +31,6 @@ rec {
manifests = config.installer.manifests; # exported here because nixos-rebuild uses it manifests = config.installer.manifests; # exported here because nixos-rebuild uses it
/*nix = pkgs.nixUnstable; # we need the exportReferencesGraph feature*/
nix = config.environment.nix pkgs; nix = config.environment.nix pkgs;
kernel = config.boot.kernel pkgs; kernel = config.boot.kernel pkgs;
@ -237,7 +236,6 @@ rec {
pkgs.utillinux pkgs.utillinux
pkgs.wirelesstools pkgs.wirelesstools
nix nix
(pkgs.lowPrio (pkgs.nixUnstable)) /* Better safe than sorry */
nixosInstall nixosInstall
nixosRebuild nixosRebuild
nixosCheckout nixosCheckout