From 93f1029b0f5eddb05ab6621ffb0aaebea38e29df Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sat, 4 Apr 2015 22:22:12 -0700
Subject: [PATCH] Get rid of fetchurlGnome

closes #1707
---
 pkgs/applications/graphics/dia/default.nix      | 10 +++++-----
 pkgs/build-support/fetchurl/gnome.nix           | 17 -----------------
 .../gnome-2/platform/ORBit2/default.nix         | 12 ++++++------
 .../gnome-2/platform/gconfmm/default.nix        | 12 ++++++------
 .../gnome-2/platform/gnome-common/default.nix   | 10 +++++-----
 .../gnome-2/platform/gnome-vfs/default.nix      | 10 +++++-----
 .../gnome-2/platform/gtkglextmm/default.nix     | 10 +++++-----
 .../gnome-2/platform/libIDL/default.nix         | 10 +++++-----
 .../gnome-2/platform/libbonobo/default.nix      | 12 ++++++------
 .../gnome-2/platform/libbonoboui/default.nix    | 12 ++++++------
 .../gnome-2/platform/libgnome/default.nix       | 10 +++++-----
 .../gnome-2/platform/libgnomecanvas/default.nix | 14 +++++++-------
 .../gnome-2/platform/libgnomeui/default.nix     | 14 +++++++-------
 pkgs/development/libraries/gtkmm/2.x.nix        | 10 +++++-----
 .../development/libraries/json-glib/default.nix | 15 ++++++---------
 pkgs/development/tools/misc/gob2/default.nix    | 10 +++++-----
 pkgs/top-level/all-packages.nix                 |  3 ---
 17 files changed, 84 insertions(+), 107 deletions(-)
 delete mode 100644 pkgs/build-support/fetchurl/gnome.nix

diff --git a/pkgs/applications/graphics/dia/default.nix b/pkgs/applications/graphics/dia/default.nix
index e498533d63d2..6200048c41dc 100644
--- a/pkgs/applications/graphics/dia/default.nix
+++ b/pkgs/applications/graphics/dia/default.nix
@@ -1,13 +1,13 @@
-{stdenv, fetchurl, fetchurlGnome, gtk, pkgconfig, perl, perlXMLParser, libxml2, gettext
+{stdenv, fetchurl, gtk, pkgconfig, perl, perlXMLParser, libxml2, gettext
 , python, libxml2Python, docbook5, docbook_xsl, libxslt, intltool, libart_lgpl
 , withGNOME ? false, libgnomeui }:
 
 stdenv.mkDerivation rec {
-  name = src.pkgname;
+  name = "dia-${minVer}.3";
+  minVer = "0.97";
 
-  src = fetchurlGnome {
-    project = "dia";
-    major = "0"; minor = "97"; patchlevel = "3"; extension = "xz";
+  src = fetchurl {
+    url = "mirror://gnome/sources/dia/${minVer}/${name}.tar.xz";
     sha256 = "0d3x6w0l6fwd0l8xx06y1h56xf8ss31yzia3a6xr9y28xx44x492";
   };
 
diff --git a/pkgs/build-support/fetchurl/gnome.nix b/pkgs/build-support/fetchurl/gnome.nix
deleted file mode 100644
index 258b11d850e5..000000000000
--- a/pkgs/build-support/fetchurl/gnome.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ fetchurl }:
-
-{ project, major, minor, patchlevel ? null, extension ? "bz2", sha256 }:
-
-let
-  baseVersion = "${major}.${minor}";
-  version = baseVersion + (if patchlevel != null then ".${patchlevel}" else "");
-  name = "${project}-${version}";
-in
-
-(fetchurl {
-  url = "mirror://gnome/sources/${project}/${baseVersion}/${name}.tar.${extension}";
-  inherit sha256;
-}) // {
-  inherit major minor patchlevel baseVersion version;
-  pkgname = name;
-}
diff --git a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix
index 45f29496f62f..754a3ce68f65 100644
--- a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix
+++ b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurlGnome, pkgconfig, glib, libIDL, libintlOrEmpty }:
+{ stdenv, fetchurl, pkgconfig, glib, libIDL, libintlOrEmpty }:
 
 stdenv.mkDerivation rec {
-  name = src.pkgname;
-  
-  src = fetchurlGnome {
-    project = "ORBit2";
-    major = "2"; minor = "14"; patchlevel = "19";
+  name = "ORBit2-${minVer}.19";
+  minVer = "2.14";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/ORBit2/${minVer}/${name}.tar.bz2";
     sha256 = "0l3mhpyym9m5iz09fz0rgiqxl2ym6kpkwpsp1xrr4aa80nlh1jam";
   };
 
diff --git a/pkgs/desktops/gnome-2/platform/gconfmm/default.nix b/pkgs/desktops/gnome-2/platform/gconfmm/default.nix
index 045f60e8b606..356d4df9d1d8 100644
--- a/pkgs/desktops/gnome-2/platform/gconfmm/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gconfmm/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurlGnome, pkgconfig, GConf, gtkmm, glibmm }:
+{ stdenv, fetchurl, pkgconfig, GConf, gtkmm, glibmm }:
 
 stdenv.mkDerivation rec {
-  name = src.pkgname;
+  name = "gconfmm-${minVer}.3";
+  minVer = "2.28";
 
-  src = fetchurlGnome {
-    project = "gconfmm";
-    major = "2"; minor = "28"; patchlevel = "3"; extension = "bz2";
+  src = fetchurl {
+    url = "mirror://gnome/sources/gconfmm/${minVer}/${name}.tar.bz2";
     sha256 = "a5e0092bb73371a3ca76b2ecae794778f3a9409056fee9b28ec1db072d8e6108";
   };
 
-  nativeBuildInputs = [pkgconfig];
+  nativeBuildInputs = [ pkgconfig ];
 
   propagatedBuildInputs = [ GConf gtkmm glibmm ];
 
diff --git a/pkgs/desktops/gnome-2/platform/gnome-common/default.nix b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix
index dba47b6e5410..6cb8ff336a0d 100644
--- a/pkgs/desktops/gnome-2/platform/gnome-common/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gnome-common/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, fetchurlGnome, which }:
+{ stdenv, fetchurl, which }:
 
 stdenv.mkDerivation rec {
-  name = src.pkgname;
+  name = "gnome-common-${minVer}.0";
+  minVer = "2.34";
 
-  src = fetchurlGnome {
-    project = "gnome-common";
-    major = "2"; minor = "34"; patchlevel = "0";
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-common/${minVer}/${name}.tar.bz2";
     sha256 = "1pz13mpp09q5s3bikm8ml92s1g0scihsm4iipqv1ql3mp6d4z73s";
   };
 
diff --git a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
index dd8b78228580..692233930603 100644
--- a/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gnome-vfs/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurlGnome, pkgconfig, libxml2, bzip2, openssl, samba, dbus_glib
+{ stdenv, fetchurl, pkgconfig, libxml2, bzip2, openssl, samba, dbus_glib
 , glib, fam, cdparanoia, intltool, GConf, gnome_mime_data, avahi, acl }:
 
 stdenv.mkDerivation rec {
-  name = src.pkgname;
+  name = "gnome-vfs-${minVer}.4";
+  minVer = "2.24";
 
-  src = fetchurlGnome {
-    project = "gnome-vfs";
-    major = "2"; minor = "24"; patchlevel = "4";
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-vfs/${minVer}/${name}.tar.bz2";
     sha256 = "1ajg8jb8k3snxc7rrgczlh8daxkjidmcv3zr9w809sq4p2sn9pk2";
   };
 
diff --git a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix
index 4ce51844a51e..bf09bd93eebc 100644
--- a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurlGnome, pkgconfig, gtkglext, gtkmm, gtk, mesa, gdk_pixbuf }:
+{ stdenv, fetchurl, pkgconfig, gtkglext, gtkmm, gtk, mesa, gdk_pixbuf }:
 
 stdenv.mkDerivation rec {
-  name = src.pkgname;
+  name = "gtkglextmm-${minVer}.0";
+  minVer = "1.2";
 
-  src = fetchurlGnome {
-    project = "gtkglextmm";
-    major = "1"; minor = "2"; patchlevel = "0"; extension = "bz2";
+  src = fetchurl {
+    url = "mirror://gnome/sources/gtkglextmm/${minVer}/${name}.tar.bz2";
     sha256 = "6cd4bd2a240e5eb1e3a24c5a3ebbf7ed905b522b888439778043fdeb58771fea";
   };
 
diff --git a/pkgs/desktops/gnome-2/platform/libIDL/default.nix b/pkgs/desktops/gnome-2/platform/libIDL/default.nix
index 73b4fb9cc499..1fc780026064 100644
--- a/pkgs/desktops/gnome-2/platform/libIDL/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libIDL/default.nix
@@ -1,11 +1,11 @@
-{stdenv, fetchurlGnome, flex, bison, pkgconfig, glib, gettext}:
+{stdenv, fetchurl, flex, bison, pkgconfig, glib, gettext}:
 
 stdenv.mkDerivation rec {
-  name = src.pkgname;
+  name = "libIDL-${minVer}.14";
+  minVer = "0.8";
 
-  src = fetchurlGnome {
-    project = "libIDL";
-    major = "0"; minor = "8"; patchlevel = "14";
+  src = fetchurl {
+    url = "mirror://gnome/sources/libIDL/${minVer}/${name}.tar.bz2";
     sha256 = "08129my8s9fbrk0vqvnmx6ph4nid744g5vbwphzkaik51664vln5";
   };
 
diff --git a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
index d9867f25a4c1..add013e64cdb 100644
--- a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurlGnome, flex, bison, pkgconfig, glib, dbus_glib, libxml2, popt
+{ stdenv, fetchurl, flex, bison, pkgconfig, glib, dbus_glib, libxml2, popt
 , intltool, ORBit2, procps }:
 
 stdenv.mkDerivation rec {
-  name = src.pkgname;
-  
-  src = fetchurlGnome {
-    project = "libbonobo";
-    major = "2"; minor = "32"; patchlevel = "1";
+  name = "libbonobo-${minVer}.1";
+  minVer = "2.32";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libbonobo/${minVer}/${name}.tar.bz2";
     sha256 = "0swp4kk6x7hy1rvd1f9jba31lvfc6qvafkvbpg9h0r34fzrd8q4i";
   };
 
diff --git a/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix
index 00a0c4763a16..efdc28aac424 100644
--- a/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libbonoboui/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurlGnome, bison, pkgconfig, popt, libxml2, gtk, libtool
+{ stdenv, fetchurl, bison, pkgconfig, popt, libxml2, gtk, libtool
 , intltool, libbonobo, GConf, libgnomecanvas, libgnome, libglade }:
 
 stdenv.mkDerivation rec {
-  name = src.pkgname;
-  
-  src = fetchurlGnome {
-    project = "libbonoboui";
-    major = "2"; minor = "24"; patchlevel = "5";
+  name = "libbonoboui-${minVer}.5";
+  minVer = "2.24";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libbonoboui/${minVer}/${name}.tar.bz2";
     sha256 = "1kbgqh7bw0fdx4f1a1aqwpff7gp5mwhbaz60c6c98bc4djng5dgs";
   };
 
diff --git a/pkgs/desktops/gnome-2/platform/libgnome/default.nix b/pkgs/desktops/gnome-2/platform/libgnome/default.nix
index edcd868b2f31..4612e6aee6f5 100644
--- a/pkgs/desktops/gnome-2/platform/libgnome/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnome/default.nix
@@ -1,13 +1,13 @@
-{ stdenv, fetchurlGnome, pkgconfig, glib, popt, zlib, libcanberra
+{ stdenv, fetchurl, pkgconfig, glib, popt, zlib, libcanberra
 , intltool, libbonobo, GConf, gnome_vfs, ORBit2, libtool, libogg
 }:
 
 stdenv.mkDerivation rec {
-  name = src.pkgname;
+  name = "libgnome-${minVer}.1";
+  minVer = "2.32";
 
-  src = fetchurlGnome {
-    project = "libgnome";
-    major = "2"; minor = "32"; patchlevel = "1";
+  src = fetchurl {
+    url = "mirror://gnome/sources/libgnome/${minVer}/${name}.tar.bz2";
     sha256 = "197pnq8y0knqjhm2fg4j6hbqqm3qfzfnd0irhwxpk1b4hqb3kimj";
   };
 
diff --git a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
index 8a1b7706409f..8c12754f112b 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurlGnome, pkgconfig, gtk, intltool, libart_lgpl, libglade }:
+{ stdenv, fetchurl, pkgconfig, gtk, intltool, libart_lgpl, libglade }:
 
 stdenv.mkDerivation rec {
-  name = src.pkgname;
-  
-  src = fetchurlGnome {
-    project = "libgnomecanvas";
-    major = "2"; minor = "30"; patchlevel = "3";
+  name = "libgnomecanvas-${minVer}.3";
+  minVer = "2.30";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libgnomecanvas/${minVer}/${name}.tar.bz2";
     sha256 = "0h6xvswbqspdifnyh5pm2pqq55yp3kn6yrswq7ay9z49hkh7i6w5";
   };
-  
+
   buildInputs = [ libglade ];
   nativeBuildInputs = [ pkgconfig intltool ];
   propagatedBuildInputs = [ libart_lgpl gtk ];
diff --git a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
index 125a45072753..d230d19d5886 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomeui/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurlGnome, pkgconfig, libxml2, xlibs, glib, pango
+{ stdenv, fetchurl, pkgconfig, libxml2, xlibs, glib, pango
 , intltool, libgnome, libgnomecanvas, libbonoboui, GConf, libtool
 , gnome_vfs, libgnome_keyring, libglade }:
 
 stdenv.mkDerivation rec {
-  name = src.pkgname;
-  
-  src = fetchurlGnome {
-    project = "libgnomeui";
-    major = "2"; minor = "24"; patchlevel = "5";
+  name = "libgnomeui-${minVer}.5";
+  minVer = "2.24";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/libgnomeui/${minVer}/${name}.tar.bz2";
     sha256 = "03rwbli76crkjl6gp422wrc9lqpl174k56cp9i96b7l8jlj2yddf";
   };
-  
+
   nativeBuildInputs = [ pkgconfig intltool ];
   buildInputs =
     [ xlibs.xlibs libxml2 GConf pango glib libgnome_keyring libglade libtool ];
diff --git a/pkgs/development/libraries/gtkmm/2.x.nix b/pkgs/development/libraries/gtkmm/2.x.nix
index 727e4b2185c0..d0782d94e5e3 100644
--- a/pkgs/development/libraries/gtkmm/2.x.nix
+++ b/pkgs/development/libraries/gtkmm/2.x.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurlGnome, pkgconfig, gtk, glibmm, cairomm, pangomm, atkmm }:
+{ stdenv, fetchurl, pkgconfig, gtk, glibmm, cairomm, pangomm, atkmm }:
 
 stdenv.mkDerivation rec {
-  name = src.pkgname;
+  name = "gtkmm-${minVer}.4";
+  minVer = "2.24";
 
-  src = fetchurlGnome {
-    project = "gtkmm";
-    major = "2"; minor = "24"; patchlevel = "4"; extension = "xz";
+  src = fetchurl {
+    url = "mirror://gnome/sources/gtkmm/${minVer}/${name}.tar.xz";
     sha256 = "1vpmjqv0aqb1ds0xi6nigxnhlr0c74090xzi15b92amlzkrjyfj4";
   };
 
diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix
index a50163c601d4..e49063a9de91 100644
--- a/pkgs/development/libraries/json-glib/default.nix
+++ b/pkgs/development/libraries/json-glib/default.nix
@@ -1,18 +1,15 @@
-{ stdenv, fetchurlGnome, glib, pkgconfig, gobjectIntrospection, dbus }:
+{ stdenv, fetchurl, glib, pkgconfig, gobjectIntrospection, dbus }:
 
 stdenv.mkDerivation rec {
-  name = src.pkgname;
+  name = "json-glib-${minVer}.2";
+  minVer = "1.0";
 
-  src = fetchurlGnome {
-    project = "json-glib";
-    major = "1";
-    minor = "0";
-    patchlevel = "2";
-    extension = "xz";
+  src = fetchurl {
+    url = "mirror://gnome/sources/json-glib/${minVer}/${name}.tar.xz";
     sha256 = "887bd192da8f5edc53b490ec51bf3ffebd958a671f5963e4f3af32c22e35660a";
   };
 
-  configureflags= "--with-introspection" ; 
+  configureflags= "--with-introspection";
 
   propagatedBuildInputs = [ glib gobjectIntrospection ];
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/tools/misc/gob2/default.nix b/pkgs/development/tools/misc/gob2/default.nix
index a434e54bba9f..c1ab6ebe0748 100644
--- a/pkgs/development/tools/misc/gob2/default.nix
+++ b/pkgs/development/tools/misc/gob2/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurlGnome, pkgconfig, glib, bison, flex }:
+{ stdenv, fetchurl, pkgconfig, glib, bison, flex }:
 
 stdenv.mkDerivation rec {
-  name = src.pkgname;
+  name = "gob2-${minVer}.18";
+  minVer = "2.0";
 
-  src = fetchurlGnome {
-    project = "gob2";
-    major = "2"; minor = "0"; patchlevel = "18"; extension = "gz";
+  src = fetchurl {
+    url = "mirror://gnome/sources/gob2/${minVer}/${name}.tar.gz";
     sha256 = "1r242s3rsxyqiw2ic2gdpvvrx903jgjd1aa4mkl26in5k9zk76fa";
   };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f88999a33b6..772542eb086e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -360,9 +360,6 @@ let
     inherit curl stdenv;
   };
 
-  # A wrapper around fetchurl that generates miror://gnome URLs automatically
-  fetchurlGnome = callPackage ../build-support/fetchurl/gnome.nix { };
-
   # fetchurlBoot is used for curl and its dependencies in order to
   # prevent a cyclic dependency (curl depends on curl.tar.bz2,
   # curl.tar.bz2 depends on fetchurl, fetchurl depends on curl).  It