* Nix 0.11.
svn path=/nixpkgs/trunk/; revision=10036
This commit is contained in:
parent
12de734949
commit
5a870b6ea9
@ -1,17 +1,17 @@
|
|||||||
{ stdenv, fetchurl, aterm, db4, perl, curl, bzip2
|
{ stdenv, fetchurl, aterm, db4, perl, curl, bzip2, openssl ? null
|
||||||
, storeDir ? "/nix/store"
|
, storeDir ? "/nix/store"
|
||||||
, stateDir ? "/nix/var"
|
, stateDir ? "/nix/var"
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation {
|
||||||
name = "nix-0.10.1";
|
name = "nix-0.11";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = http://nix.cs.uu.nl/dist/nix/nix-0.10.1/nix-0.10.1.tar.bz2;
|
url = http://nix.cs.uu.nl/dist/nix/nix-0.11/nix-0.11.tar.bz2;
|
||||||
md5 = "22dc0c024ca5bb477da0b38ba834dbf2";
|
md5 = "890c25ac0005ff466683869efc288b67";
|
||||||
};
|
};
|
||||||
|
|
||||||
buildInputs = [perl curl];
|
buildInputs = [perl curl openssl];
|
||||||
|
|
||||||
configureFlags = "
|
configureFlags = "
|
||||||
--with-store-dir=${storeDir} --localstatedir=${stateDir}
|
--with-store-dir=${storeDir} --localstatedir=${stateDir}
|
||||||
|
@ -4907,9 +4907,9 @@ rec {
|
|||||||
};
|
};
|
||||||
|
|
||||||
nix = import ../tools/package-management/nix {
|
nix = import ../tools/package-management/nix {
|
||||||
inherit fetchurl stdenv perl curl bzip2;
|
inherit fetchurl stdenv perl curl bzip2 openssl;
|
||||||
aterm = aterm242fixes;
|
aterm = aterm242fixes;
|
||||||
db4 = db44;
|
db4 = db45;
|
||||||
};
|
};
|
||||||
|
|
||||||
nixStatic = import ../tools/package-management/nix-static {
|
nixStatic = import ../tools/package-management/nix-static {
|
||||||
|
Loading…
Reference in New Issue
Block a user