dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

* Use Nix 0.10.1.

Browse Source 
svn path=/nixpkgs/trunk/; revision=6695
This commit is contained in:
Eelco Dolstra 2006-10-11 12:25:40 +00:00
parent 22dbea9161
commit 29a457c5b0
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/misc/nix/default.nix
View File

@ -4,15 +4,13 @@
}: }:
assert aterm != null && bdb != null && perl != null; assert aterm != null && bdb != null && perl != null;
# assert bdb.version >= 4.2
# assert aterm.version >= 2.0
stdenv.mkDerivation { stdenv.mkDerivation {
name = "nix-0.10"; name = "nix-0.10.1";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = http://nix.cs.uu.nl/dist/nix/nix-0.10/nix-0.10.tar.bz2; url = http://nix.cs.uu.nl/dist/nix/nix-0.10.1/nix-0.10.1.tar.bz2;
md5 = "2e5db8be894b28873b5bb1b25194955f"; md5 = "22dc0c024ca5bb477da0b38ba834dbf2";
}; };
buildInputs = [aterm bdb perl curl]; buildInputs = [aterm bdb perl curl];
inherit storeDir stateDir aterm bdb; inherit storeDir stateDir aterm bdb;

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

@ -2794,10 +2794,14 @@ rec {
bdb = db4; bdb = db4;
}; };
nixUnstable = nix;
/*
nixUnstable = (import ../misc/nix-unstable) { nixUnstable = (import ../misc/nix-unstable) {
inherit fetchurl stdenv aterm perl curl; inherit fetchurl stdenv aterm perl curl;
bdb = db4; bdb = db4;
}; };
*/
polytable = (import ../misc/tex/polytable) { polytable = (import ../misc/tex/polytable) {
inherit fetchurl stdenv tetex lazylist; inherit fetchurl stdenv tetex lazylist;