Make `nixUnstable' the default.
svn path=/nixpkgs/trunk/; revision=21616
This commit is contained in:
parent
d9de1677cc
commit
1edabb560c
@ -9289,21 +9289,19 @@ let
|
||||
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;
|
||||
storeDir = getPkgConfig "nix" "storeDir" "/nix/store";
|
||||
stateDir = getPkgConfig "nix" "stateDir" "/nix/var";
|
||||
};
|
||||
|
||||
# The bleeding edge.
|
||||
nixUnstable = nix;
|
||||
/*
|
||||
nixUnstable = makeOverridable (import ../tools/package-management/nix/unstable.nix) {
|
||||
inherit fetchurl stdenv perl curl bzip2 openssl aterm;
|
||||
storeDir = getPkgConfig "nix" "storeDir" "/nix/store";
|
||||
stateDir = getPkgConfig "nix" "stateDir" "/nix/var";
|
||||
};
|
||||
*/
|
||||
|
||||
# The SQLite branch.
|
||||
nixSqlite = lowPrio (makeOverridable (import ../tools/package-management/nix/sqlite.nix) {
|
||||
|
Loading…
Reference in New Issue
Block a user