forked from mirrors/nixpkgs
* Updated nixUnstable to the latest version. This is the first no-bdb
version, so if you use it, it will convert /nix/var/nix/db to the new schema. svn path=/nixpkgs/trunk/; revision=12181
This commit is contained in:
parent
106c67b9db
commit
b81415699f
|
@ -7,7 +7,7 @@ stdenv.mkDerivation {
|
|||
name = "nix-0.11";
|
||||
|
||||
src = fetchurl {
|
||||
url = http://nix.cs.uu.nl/dist/nix/nix-0.11/nix-0.11.tar.bz2;
|
||||
url = http://nixos.org/releases/nix/nix-0.11/nix-0.11.tar.bz2;
|
||||
md5 = "890c25ac0005ff466683869efc288b67";
|
||||
};
|
||||
|
||||
|
@ -20,7 +20,7 @@ stdenv.mkDerivation {
|
|||
|
||||
meta = {
|
||||
description = "The Nix Deployment System";
|
||||
homepage = http://nix.cs.uu.nl/;
|
||||
homepage = http://nixos.org/;
|
||||
license = "LGPL";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,29 +1,31 @@
|
|||
{ stdenv, fetchurl, aterm, db4, perl, curl, bzip2, openssl ? null
|
||||
, storeDir ? "/nix/store"
|
||||
, stateDir ? "/nix/var"
|
||||
, supportOldDBs ? true
|
||||
}:
|
||||
|
||||
let version = "0.12pre11304"; in
|
||||
let version = "0.12pre12178"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "nix-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://nixos.org/releases/nix/nix-${version}-6hxl2ybs/nix-${version}.tar.bz2";
|
||||
sha256 = "8f33687ed70d4e1453cf62c0a9c5010cc49ed787794320ef94e9ead740fd042b";
|
||||
url = "http://nixos.org/releases/nix/nix-${version}-ncl8zjnw/nix-${version}.tar.bz2";
|
||||
sha256 = "7a5cc47272a56035bb949b32a41e7a42cfdee271334a4f12e48c96362ebd7697";
|
||||
};
|
||||
|
||||
buildInputs = [perl curl openssl];
|
||||
|
||||
configureFlags = ''
|
||||
--with-store-dir=${storeDir} --localstatedir=${stateDir}
|
||||
--with-aterm=${aterm} --with-bdb=${db4} --with-bzip2=${bzip2}
|
||||
--with-aterm=${aterm} --with-bzip2=${bzip2}
|
||||
${if supportOldDBs then "--with-bdb=${db4}" else "--disable-old-db-compat"}
|
||||
--disable-init-state
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "The Nix Deployment System";
|
||||
homepage = http://nix.cs.uu.nl/;
|
||||
homepage = http://nixos.org/;
|
||||
license = "LGPL";
|
||||
};
|
||||
}
|
||||
|
|
|
@ -6996,15 +6996,11 @@ let pkgs = rec {
|
|||
inherit fetchurl stdenv perl curl bzip2 openssl;
|
||||
aterm = aterm242fixes;
|
||||
db4 = db45;
|
||||
supportOldDBs = false;
|
||||
};
|
||||
|
||||
# The really bleeding edge.
|
||||
nixNoBDB = lowPrio (nixCustomFun
|
||||
(fetchurl {
|
||||
url = http://nixos.org/releases/nix-no-bdb/nix-0.12pre11675-jvhinhlm/nix-0.12pre11675.tar.bz2;
|
||||
sha256 = "1c20dd159f0f7ffb7105745426b64097f833b265604e14ff77f94da2d145d44b";
|
||||
})
|
||||
"" [] "");
|
||||
# !!! remove in a few weeks, obsolete
|
||||
nixNoBDB = nixUnstable;
|
||||
|
||||
nixCustomFun = src: preConfigure: enableScripts: configureFlags:
|
||||
import ../tools/package-management/nix/custom.nix {
|
||||
|
|
Loading…
Reference in a new issue