nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-02 15:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

update to pre6052, remove patches, since these are in Nix now

Browse Source 
svn path=/nixpkgs/trunk/; revision=6053
This commit is contained in:
Armijn Hemel 2006-08-05 09:44:26 +00:00
parent 0345f37f1c
commit 68e7009fcc
3 changed files with 4 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/misc/nix-unstable/default.nix
View File

@ -8,17 +8,16 @@ assert aterm != null && bdb != null && perl != null;
# assert aterm.version >= 2.0
stdenv.mkDerivation {
name = "nix-0.10pre6047";
name = "nix-0.10pre6052";
builder = ./builder.sh;
src = fetchurl {
url = http://nix.cs.uu.nl/dist/nix/nix-0.10pre6047/nix-0.10pre6047.tar.bz2;
md5 = "40f68dd3555dbb12478a468df301c3a9";
url = http://nix.cs.uu.nl/dist/nix/nix-0.10pre6052/nix-0.10pre6052.tar.bz2;
md5 = "89c131d6c11da091067a14d1eddaf3aa";
};
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
# is set. Not needed to build or install NixOS.
#patches = [./nix-0.10pre5679.patch];
patches = [./nix-0.10pre5896-paths.patch ./nix-0.10pre5896-chroot-once.patch];
}

28
pkgs/misc/nix-unstable/nix-0.10pre5896-chroot-once.patch
View File

@ -1,28 +0,0 @@
diff -rc nix-0.10pre5896/scripts/download-using-manifests.pl.in nix-0.10pre5896.new/scripts/download-using-manifests.pl.in
*** nix-0.10pre5896/scripts/download-using-manifests.pl.in 2006-07-24 20:39:47.000000000 +0200
--- nix-0.10pre5896.new/scripts/download-using-manifests.pl.in 2006-08-02 21:45:53.000000000 +0200
***************
*** 9,14 ****
--- 9,15 ----
open LOGFILE, ">>$logFile" or die "cannot open log file $logFile";
+ delete $ENV{"NIX_ROOT"};
# Create a temporary directory.
my $tmpDir;
diff -rc nix-0.10pre5896/scripts/nix-prefetch-url.in nix-0.10pre5896.new/scripts/nix-prefetch-url.in
*** nix-0.10pre5896/scripts/nix-prefetch-url.in 2006-07-24 20:39:47.000000000 +0200
--- nix-0.10pre5896.new/scripts/nix-prefetch-url.in 2006-08-02 21:13:46.000000000 +0200
***************
*** 3,8 ****
--- 3,11 ----
url=$1
expHash=$2
+ # to prevent doing more than 1 chroot
+ unset NIX_ROOT
+
hashType=$NIX_HASH_ALGO
if test -z "$hashType"; then
hashType=md5

14
pkgs/misc/nix-unstable/nix-0.10pre5896-paths.patch
View File

@ -1,14 +0,0 @@
diff -rc nix-0.10pre5896/scripts/nix-prefetch-url.in nix-0.10pre5896.new/scripts/nix-prefetch-url.in
*** nix-0.10pre5896/scripts/nix-prefetch-url.in 2006-07-24 20:39:47.000000000 +0200
--- nix-0.10pre5896.new/scripts/nix-prefetch-url.in 2006-08-02 20:01:15.000000000 +0200
***************
*** 3,8 ****
--- 3,10 ----
url=$1
expHash=$2
+ export PATH=$PATH:@coreutils@
+
hashType=$NIX_HASH_ALGO
if test -z "$hashType"; then
hashType=md5