public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Use the latest Nix. What a relief. :-)

Browse Source 
svn path=/nixpkgs/trunk/; revision=10801
This commit is contained in:
Eelco Dolstra 2008-02-21 13:44:06 +00:00
parent 3a49502530
commit 051cd950fe
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/package-management/nix/unstable.nix
View File

@ -3,14 +3,14 @@
, stateDir ? "/nix/var" , stateDir ? "/nix/var"
}: }:
let version = "0.12pre10505"; in let version = "0.12pre10798"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "nix-${version}"; name = "nix-${version}";
src = fetchurl { src = fetchurl {
url = "http://nix.cs.uu.nl/dist/nix/nix-${version}/nix-${version}.tar.bz2"; url = "http://nix.cs.uu.nl/dist/nix/nix-${version}/nix-${version}.tar.bz2";
md5 = "44dd2927ce97f12b3f110a7ad991828e"; md5 = "1f3d0a72c9bf1297c2daa32e601bde82";
}; };
buildInputs = [perl curl openssl]; buildInputs = [perl curl openssl];

19
pkgs/top-level/all-packages.nix
View File

@ -5760,17 +5760,16 @@ rec {
db4 = db45; db4 = db45;
}; };
nixCustomFun = src: preConfigure: configureFlags : nixCustomFun = src: preConfigure: configureFlags:
(import ../tools/package-management/nix/custom.nix { import ../tools/package-management/nix/custom.nix {
inherit fetchurl stdenv perl curl bzip2 openssl src preConfigure automake inherit fetchurl stdenv perl curl bzip2 openssl src preConfigure automake
autoconf libtool configureFlags; autoconf libtool configureFlags;
bison = bison23; bison = bison23;
flex = flex2533; flex = flex2533;
aterm = aterm242fixes; aterm = aterm242fixes;
db4 = db45; db4 = db45;
inherit docbook5_xsl libxslt docbook5 docbook_xml_dtd_43 w3m; inherit docbook5_xsl libxslt docbook5 docbook_xml_dtd_43 w3m;
};
});
ntfs3g = import ../misc/ntfs-3g { ntfs3g = import ../misc/ntfs-3g {
inherit fetchurl stdenv fuse pkgconfig; inherit fetchurl stdenv fuse pkgconfig;