public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make `nixUnstable' the default. 

svn path=/nixpkgs/trunk/; revision=21616
This commit is contained in:
Ludovic Courtès 2010-05-05 19:48:32 +00:00
parent d9de1677cc
commit 1edabb560c
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/top-level/all-packages.nix
View File

@ -9289,21 +9289,19 @@ let
inherit stdenv fetchurl jdk makeWrapper; inherit stdenv fetchurl jdk makeWrapper;
}; };
nix = makeOverridable (import ../tools/package-management/nix) { nix = nixUnstable;
nixStable = makeOverridable (import ../tools/package-management/nix) {
inherit fetchurl stdenv perl curl bzip2 openssl aterm; inherit fetchurl stdenv perl curl bzip2 openssl aterm;
storeDir = getPkgConfig "nix" "storeDir" "/nix/store"; storeDir = getPkgConfig "nix" "storeDir" "/nix/store";
stateDir = getPkgConfig "nix" "stateDir" "/nix/var"; stateDir = getPkgConfig "nix" "stateDir" "/nix/var";
}; };
# The bleeding edge.
nixUnstable = nix;
/*
nixUnstable = makeOverridable (import ../tools/package-management/nix/unstable.nix) { nixUnstable = makeOverridable (import ../tools/package-management/nix/unstable.nix) {
inherit fetchurl stdenv perl curl bzip2 openssl aterm; inherit fetchurl stdenv perl curl bzip2 openssl aterm;
storeDir = getPkgConfig "nix" "storeDir" "/nix/store"; storeDir = getPkgConfig "nix" "storeDir" "/nix/store";
stateDir = getPkgConfig "nix" "stateDir" "/nix/var"; stateDir = getPkgConfig "nix" "stateDir" "/nix/var";
}; };
*/
# The SQLite branch. # The SQLite branch.
nixSqlite = lowPrio (makeOverridable (import ../tools/package-management/nix/sqlite.nix) { nixSqlite = lowPrio (makeOverridable (import ../tools/package-management/nix/sqlite.nix) {