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

Update Nix unstable.

Browse Source 
svn path=/nixpkgs/trunk/; revision=23832
This commit is contained in:
Ludovic Courtès 2010-09-17 15:56:15 +00:00
parent 84302a3554
commit 2739c3aa1e
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/package-management/nix/unstable.nix
View File

@ -4,11 +4,11 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "nix-0.16pre22611"; name = "nix-1.0pre23787";
src = fetchurl { src = fetchurl {
url = "http://hydra.nixos.org/build/486717/download/4/${name}.tar.bz2"; url = "http://hydra.nixos.org/build/632513/download/4/${name}.tar.bz2";
sha256 = "1dazafq1flfyha9j5v31n46wh2bwg0iq59bwwgdk7n2xa8y7dz93"; sha256 = "01zn61ak6glyqpjxkzj8a7qw1vrfml1axky1jh1axkw6j35c34d7";
}; };
buildNativeInputs = [ perl ]; buildNativeInputs = [ perl ];

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

@ -6853,13 +6853,11 @@ let
stateDir = getPkgConfig "nix" "stateDir" "/nix/var"; stateDir = getPkgConfig "nix" "stateDir" "/nix/var";
}; };
nixUnstable = nixStable;
/*
nixUnstable = callPackage ../tools/package-management/nix/unstable.nix { nixUnstable = callPackage ../tools/package-management/nix/unstable.nix {
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) {