diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-10-11 15:31:52 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-10-11 15:31:52 +0000 |
commit | 7d16a56b6f08bf73fb10385a3bfd25a4e9cd2970 (patch) | |
tree | b3c67c9ddc6f77c88bec7fbd8b8bdf3134f54055 /pkgs/misc | |
parent | 64bb1e38df693bcb3ecdd7ea746b438838ab0429 (diff) |
* Nix: no longer need a builder, use an external bzip2, removed
nix-unstable. svn path=/nixpkgs/trunk/; revision=6702
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/nix-unstable/builder.sh | 8 | ||||
-rw-r--r-- | pkgs/misc/nix-unstable/default.nix | 23 | ||||
-rw-r--r-- | pkgs/misc/nix-unstable/nix-0.10pre5679.patch | 25 | ||||
-rw-r--r-- | pkgs/misc/nix/builder.sh | 8 | ||||
-rw-r--r-- | pkgs/misc/nix/default.nix | 15 |
5 files changed, 9 insertions, 70 deletions
diff --git a/pkgs/misc/nix-unstable/builder.sh b/pkgs/misc/nix-unstable/builder.sh deleted file mode 100644 index 0decd4f50c38d..0000000000000 --- a/pkgs/misc/nix-unstable/builder.sh +++ /dev/null @@ -1,8 +0,0 @@ -source $stdenv/setup - -configureFlags="\ - --with-store-dir=$storeDir --localstatedir=$stateDir \ - --with-aterm=$aterm --with-bdb=$bdb \ - --disable-init-state" - -genericBuild diff --git a/pkgs/misc/nix-unstable/default.nix b/pkgs/misc/nix-unstable/default.nix deleted file mode 100644 index 42470a8d3bc4c..0000000000000 --- a/pkgs/misc/nix-unstable/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ stdenv, fetchurl, aterm, bdb, perl, curl -, storeDir ? "/nix/store" -, stateDir ? "/nix/var" -}: - -assert aterm != null && bdb != null && perl != null; -# assert bdb.version >= 4.2 -# assert aterm.version >= 2.0 - -stdenv.mkDerivation { - name = "nix-0.10pre6619"; - builder = ./builder.sh; - src = fetchurl { - url = http://nix.cs.uu.nl/dist/nix/nix-0.10pre6619/nix-0.10pre6619.tar.bz2; - md5 = "551a2ab48b87c0e7d95adc69a8f57e4e"; - }; - buildInputs = [aterm bdb perl curl]; - inherit storeDir stateDir aterm bdb; - - # uncomment if you want to be able to use nix-prefetch-url when NIX_ROOT - # is set. Not needed to build or install NixOS. - #patches = [./nix-0.10pre5679.patch]; -} diff --git a/pkgs/misc/nix-unstable/nix-0.10pre5679.patch b/pkgs/misc/nix-unstable/nix-0.10pre5679.patch deleted file mode 100644 index 4d72c1989416c..0000000000000 --- a/pkgs/misc/nix-unstable/nix-0.10pre5679.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -ruN nix-0.10pre5679/scripts/nix-prefetch-url.in nix-0.10pre5679.new/scripts/nix-prefetch-url.in ---- nix-0.10pre5679/scripts/nix-prefetch-url.in 2006-07-11 13:24:20.000000000 +0200 -+++ nix-0.10pre5679.new/scripts/nix-prefetch-url.in 2006-08-01 11:54:02.000000000 +0200 -@@ -39,10 +39,10 @@ - - tmpPath=/tmp/nix-prefetch-url-$$ # !!! security? - tmpFile=$tmpPath/$name -- mkdir $tmpPath -+ mkdir -p $NIX_ROOT/$tmpPath - - # Perform the download. -- @curl@ --fail --location --max-redirs 20 "$url" > $tmpFile -+ @curl@ --fail --location --max-redirs 20 "$url" > $NIX_ROOT/$tmpFile - - # Compute the hash. - hash=$(@bindir@/nix-hash --type "$hashType" $hashFormat --flat $tmpFile) -@@ -51,7 +51,7 @@ - # Add the downloaded file to the Nix store. - finalPath=$(@bindir@/nix-store --add-fixed "$hashType" $tmpFile) - -- if test -n "$tmpPath"; then rm -rf $tmpPath || true; fi -+ if test -n "$NIX_ROOT/$tmpPath"; then rm -rf $NIX_ROOT/$tmpPath || true; fi - - if test -n "$expHash" -a "$expHash" != "$hash"; then - echo "hash mismatch for URL \`$url'" diff --git a/pkgs/misc/nix/builder.sh b/pkgs/misc/nix/builder.sh deleted file mode 100644 index 0decd4f50c38d..0000000000000 --- a/pkgs/misc/nix/builder.sh +++ /dev/null @@ -1,8 +0,0 @@ -source $stdenv/setup - -configureFlags="\ - --with-store-dir=$storeDir --localstatedir=$stateDir \ - --with-aterm=$aterm --with-bdb=$bdb \ - --disable-init-state" - -genericBuild diff --git a/pkgs/misc/nix/default.nix b/pkgs/misc/nix/default.nix index 42d2ac8c2c0ca..8f91b7419ebd3 100644 --- a/pkgs/misc/nix/default.nix +++ b/pkgs/misc/nix/default.nix @@ -1,17 +1,20 @@ -{ stdenv, fetchurl, aterm, bdb, perl, curl +{ stdenv, fetchurl, aterm, db4, perl, curl, bzip2 , storeDir ? "/nix/store" , stateDir ? "/nix/var" }: -assert aterm != null && bdb != null && perl != null; - stdenv.mkDerivation { name = "nix-0.10.1"; - builder = ./builder.sh; + src = fetchurl { url = http://nix.cs.uu.nl/dist/nix/nix-0.10.1/nix-0.10.1.tar.bz2; md5 = "22dc0c024ca5bb477da0b38ba834dbf2"; }; - buildInputs = [aterm bdb perl curl]; - inherit storeDir stateDir aterm bdb; + + buildInputs = [perl curl]; + + configureFlags = " + --with-store-dir=${storeDir} --localstatedir=${stateDir} + --with-aterm=${aterm} --with-bdb=${db4} --with-bzip2=${bzip2} + --disable-init-state"; } |