* Get rid of fetchurl, we don't need it anymore.

4 files changed, 1 insertions, 40 deletions

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;
-}