From 7d876f8fa7b6c3ce120a66b59f69b70ae526538b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu, 7 Apr 2005 14:35:44 +0000
Subject: [PATCH] * Get rid of fetchurl, we don't need it anymore.

---
 corepkgs/Makefile.am            |  2 +-
 corepkgs/fetchurl/Makefile.am   | 11 -----------
 corepkgs/fetchurl/builder.sh.in |  5 -----
 corepkgs/fetchurl/default.nix   | 23 -----------------------
 scripts/nix-channel.in          | 16 ++++++++--------
 tests/init.sh                   |  1 -
 6 files changed, 9 insertions(+), 49 deletions(-)
 delete mode 100644 corepkgs/fetchurl/Makefile.am
 delete mode 100644 corepkgs/fetchurl/builder.sh.in
 delete mode 100644 corepkgs/fetchurl/default.nix

diff --git a/corepkgs/Makefile.am b/corepkgs/Makefile.am
index c9ea11cefc..b303a30eba 100644
--- a/corepkgs/Makefile.am
+++ b/corepkgs/Makefile.am
@@ -1 +1 @@
-SUBDIRS = fetchurl nar buildenv channels
+SUBDIRS = nar buildenv channels
diff --git a/corepkgs/fetchurl/Makefile.am b/corepkgs/fetchurl/Makefile.am
deleted file mode 100644
index 3cb63e0ce1..0000000000
--- a/corepkgs/fetchurl/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-all-local: builder.sh
-
-install-exec-local:
-	$(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs
-	$(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs/fetchurl
-	$(INSTALL_DATA) default.nix $(DESTDIR)$(datadir)/nix/corepkgs/fetchurl
-	$(INSTALL_PROGRAM) builder.sh $(DESTDIR)$(datadir)/nix/corepkgs/fetchurl
-
-include ../../substitute.mk
-
-EXTRA_DIST = default.nix builder.sh.in
diff --git a/corepkgs/fetchurl/builder.sh.in b/corepkgs/fetchurl/builder.sh.in
deleted file mode 100644
index 02abb18b4b..0000000000
--- a/corepkgs/fetchurl/builder.sh.in
+++ /dev/null
@@ -1,5 +0,0 @@
-#! @shell@ -e
-
-echo "downloading $url into $out"
-
-@curl@ --fail --location --max-redirs 20 "$url" > "$out"
diff --git a/corepkgs/fetchurl/default.nix b/corepkgs/fetchurl/default.nix
deleted file mode 100644
index 37f01b55ee..0000000000
--- a/corepkgs/fetchurl/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-# Argh, this thing is duplicated (more-or-less) in Nixpkgs.  Need to
-# find a way to combine them.
-
-{system, url, outputHash ? "", outputHashAlgo ? "", md5 ? "", sha1 ? "", sha256 ? ""}:
-
-assert (outputHash != "" && outputHashAlgo != "")
-    || md5 != "" || sha1 != "" || sha256 != "";
-
-derivation {
-  name = baseNameOf (toString url);
-  builder = ./builder.sh;
-
-  # Compatibility with Nix <= 0.7.
-  id = md5;
-
-  # New-style output content requirements.
-  outputHashAlgo = if outputHashAlgo != "" then outputHashAlgo else
-      if sha256 != "" then "sha256" else if sha1 != "" then "sha1" else "md5";
-  outputHash = if outputHash != "" then outputHash else
-      if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5;
-  
-  inherit system url;
-}
diff --git a/scripts/nix-channel.in b/scripts/nix-channel.in
index 84fa72e359..42e715605d 100644
--- a/scripts/nix-channel.in
+++ b/scripts/nix-channel.in
@@ -81,17 +81,14 @@ sub update {
     # expressions.
 
     my $nixExpr = "[";
-    
     foreach my $url (@channels) {
         my $fullURL = "$url/nixexprs.tar.bz2";
-        my $hash = `@bindir@/nix-prefetch-url '$fullURL' 2> /dev/null`
-            or die "cannot fetch `$fullURL'";
-        chomp $hash;
-        # !!! escaping
-        $nixExpr .= "((import @datadir@/nix/corepkgs/fetchurl) " .
-            "{url = $fullURL; md5 = \"$hash\"; system = \"@system@\";}) "
+        $ENV{"PRINT_PATH"} = 1;
+        my ($hash, $path) = `@bindir@/nix-prefetch-url '$fullURL' 2> /dev/null`;
+        die "cannot fetch `$fullURL'" if $? != 0;
+        chomp $path;
+        $nixExpr .= $path . " ";
     }
-
     $nixExpr .= "]";
 
     $nixExpr =
@@ -134,6 +131,9 @@ EOF
 }
 
 
+usageError if scalar @ARGV == 0;
+
+
 while (scalar @ARGV) {
     my $arg = shift @ARGV;
 
diff --git a/tests/init.sh b/tests/init.sh
index b39688fbe9..435fc37276 100644
--- a/tests/init.sh
+++ b/tests/init.sh
@@ -41,7 +41,6 @@ cp -pr $TOP/corepkgs $NIX_DATA_DIR/nix/
 # (and likely to fail).
 for i in \
     $NIX_DATA_DIR/nix/corepkgs/nar/nar.sh \
-    $NIX_DATA_DIR/nix/corepkgs/fetchurl/builder.sh \
     $NIX_BIN_DIR/nix/download-using-manifests.pl \
     $NIX_BIN_DIR/nix-prefetch-url \
     $NIX_BIN_DIR/nix-collect-garbage \