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

update to nix-0.10pre6047, remove patch, since it is no longer needed

Browse Source 
svn path=/nixpkgs/trunk/; revision=6050
This commit is contained in:
Armijn Hemel 2006-08-05 00:28:06 +00:00
parent b60bc10218
commit 0345f37f1c
2 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8,11 +8,11 @@ assert aterm != null && bdb != null && perl != null;
# assert aterm.version >= 2.0 # assert aterm.version >= 2.0
stdenv.mkDerivation { stdenv.mkDerivation {
name = "nix-0.10pre5896"; name = "nix-0.10pre6047";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = http://nix.cs.uu.nl/dist/nix/nix-0.10pre5896/nix-0.10pre5896.tar.bz2; url = http://nix.cs.uu.nl/dist/nix/nix-0.10pre6047/nix-0.10pre6047.tar.bz2;
md5 = "509d4a452cbf2894a86184b5eaf45abd"; md5 = "40f68dd3555dbb12478a468df301c3a9";
}; };
buildInputs = [aterm bdb perl curl]; buildInputs = [aterm bdb perl curl];
inherit storeDir stateDir aterm bdb; inherit storeDir stateDir aterm bdb;
@ -20,5 +20,5 @@ stdenv.mkDerivation {
# uncomment if you want to be able to use nix-prefetch-url when NIX_ROOT # uncomment if you want to be able to use nix-prefetch-url when NIX_ROOT
# is set # is set
#patches = [./nix-0.10pre5679.patch]; #patches = [./nix-0.10pre5679.patch];
patches = [./nix-0.10pre5896-date.patch ./nix-0.10pre5896-paths.patch ./nix-0.10pre5896-chroot-once.patch]; patches = [./nix-0.10pre5896-paths.patch ./nix-0.10pre5896-chroot-once.patch];
} }

20
pkgs/misc/nix-unstable/nix-0.10pre5896-date.patch
View File

@ -1,20 +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 18:06:53.000000000 +0200
***************
*** 27,33 ****
die unless scalar @ARGV == 1;
my $targetPath = $ARGV[0];
! my $date = `date` or die;
chomp $date;
print LOGFILE "$$ get $targetPath $date\n";
--- 27,33 ----
die unless scalar @ARGV == 1;
my $targetPath = $ARGV[0];
! my $date = `@coreutils@/date` or die;
chomp $date;
print LOGFILE "$$ get $targetPath $date\n";