From 1edabb560c14770c09674e0fe330f0df9bd6effc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Wed, 5 May 2010 19:48:32 +0000 Subject: [PATCH] Make `nixUnstable' the default. svn path=/nixpkgs/trunk/; revision=21616 --- pkgs/top-level/all-packages.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4acbce20f3f5..2f09392cebf9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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) {