MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

* Updated Nix to 0.15.

Browse source 
svn path=/nixpkgs/trunk/; revision=20697
This commit is contained in:
Eelco Dolstra 2010-03-17 12:16:03 +00:00
parent 4824ecbb62
commit 8396168276
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pkgs/tools/package-management/nix/default.nix
View file

@ -4,11 +4,11 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "nix-0.14"; name = "nix-0.15";
src = fetchurl { src = fetchurl {
url = "http://hydra.nixos.org/build/281118/download/4/${name}.tar.bz2"; url = "http://hydra.nixos.org/build/326788/download/4/${name}.tar.bz2";
sha256 = "7df3dd52a7a42354e845302665c3e1f67af287f9cca2bda67f8abb724e52c519"; sha256 = "2d125e75dba387075a8bd443926d7fc6752e54cc9a21c2ef32e44fffc445a8ce";
}; };
buildInputs = [ perl curl openssl ]; buildInputs = [ perl curl openssl ];

3
pkgs/top-level/all-packages.nix
View file

@ -9102,11 +9102,14 @@ let
}; };
# The bleeding edge. # 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) {