* Use the latest Nix. What a relief. :-)
svn path=/nixpkgs/trunk/; revision=10801
This commit is contained in:
parent
3a49502530
commit
051cd950fe
@ -3,14 +3,14 @@
|
||||
, stateDir ? "/nix/var"
|
||||
}:
|
||||
|
||||
let version = "0.12pre10505"; in
|
||||
let version = "0.12pre10798"; in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
name = "nix-${version}";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://nix.cs.uu.nl/dist/nix/nix-${version}/nix-${version}.tar.bz2";
|
||||
md5 = "44dd2927ce97f12b3f110a7ad991828e";
|
||||
md5 = "1f3d0a72c9bf1297c2daa32e601bde82";
|
||||
};
|
||||
|
||||
buildInputs = [perl curl openssl];
|
||||
|
@ -5760,17 +5760,16 @@ rec {
|
||||
db4 = db45;
|
||||
};
|
||||
|
||||
nixCustomFun = src: preConfigure: configureFlags :
|
||||
(import ../tools/package-management/nix/custom.nix {
|
||||
inherit fetchurl stdenv perl curl bzip2 openssl src preConfigure automake
|
||||
nixCustomFun = src: preConfigure: configureFlags:
|
||||
import ../tools/package-management/nix/custom.nix {
|
||||
inherit fetchurl stdenv perl curl bzip2 openssl src preConfigure automake
|
||||
autoconf libtool configureFlags;
|
||||
bison = bison23;
|
||||
flex = flex2533;
|
||||
aterm = aterm242fixes;
|
||||
db4 = db45;
|
||||
inherit docbook5_xsl libxslt docbook5 docbook_xml_dtd_43 w3m;
|
||||
|
||||
});
|
||||
bison = bison23;
|
||||
flex = flex2533;
|
||||
aterm = aterm242fixes;
|
||||
db4 = db45;
|
||||
inherit docbook5_xsl libxslt docbook5 docbook_xml_dtd_43 w3m;
|
||||
};
|
||||
|
||||
ntfs3g = import ../misc/ntfs-3g {
|
||||
inherit fetchurl stdenv fuse pkgconfig;
|
||||
|
Loading…
Reference in New Issue
Block a user