diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 1a507f20a04..bfcf3697d8a 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -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]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9cb844a6eaa..1bf3f007775 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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;