From 7fd42a83806404c5a8c6f6eadaad9f6f910d187f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 14 Jan 2013 12:00:32 +0100
Subject: [PATCH] Get rid of the "sf" alias for "sourceforge"

---
 pkgs/applications/editors/jedit/default.nix               | 2 +-
 pkgs/applications/misc/semnotes/default.nix               | 2 +-
 pkgs/build-support/fetchurl/mirrors.nix                   | 2 --
 pkgs/data/fonts/libertine/default.nix                     | 2 +-
 pkgs/development/libraries/clucene-core/default.nix       | 2 +-
 pkgs/development/libraries/cppunit/default.nix            | 2 +-
 pkgs/development/libraries/hunspell/default.nix           | 2 +-
 pkgs/development/libraries/indilib/default.nix            | 2 +-
 pkgs/development/libraries/libnova/default.nix            | 2 +-
 pkgs/development/libraries/libqalculate/default.nix       | 2 +-
 pkgs/development/libraries/libxklavier/default.nix        | 2 +-
 pkgs/development/libraries/qimageblitz/default.nix        | 2 +-
 pkgs/development/libraries/qjson/default.nix              | 2 +-
 pkgs/development/libraries/science/math/atlas/default.nix | 2 +-
 pkgs/games/uqm/default.nix                                | 8 ++++----
 pkgs/os-specific/linux/acpi/default.nix                   | 2 +-
 pkgs/servers/mail/freepops/default.nix                    | 2 +-
 pkgs/tools/misc/ised/default.nix                          | 2 +-
 18 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/pkgs/applications/editors/jedit/default.nix b/pkgs/applications/editors/jedit/default.nix
index 194f13a090cd..efaf719c7c47 100644
--- a/pkgs/applications/editors/jedit/default.nix
+++ b/pkgs/applications/editors/jedit/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "jedit-4.4.2";
 
   src = fetchurl {
-    url = mirror://sf/jedit/jedit4.4.2source.tar.bz2;
+    url = mirror://sourceforge/jedit/jedit4.4.2source.tar.bz2;
     sha256 = "5e9ad9c32871b77ef0b9fe46dcfcea57ec52558d36113b7280194a33430b8ceb";
   };
 
diff --git a/pkgs/applications/misc/semnotes/default.nix b/pkgs/applications/misc/semnotes/default.nix
index fbc4df3a0b77..52a575130c0e 100644
--- a/pkgs/applications/misc/semnotes/default.nix
+++ b/pkgs/applications/misc/semnotes/default.nix
@@ -3,7 +3,7 @@ stdenv.mkDerivation {
   name = "semnotes-0.4.0-1";
 
   src = fetchurl {
-    url = "mirror://sf/semn/0.4.0/semnotes-0.4.0-1-src.tar.bz2";
+    url = "mirror://sourceforge/semn/0.4.0/semnotes-0.4.0-1-src.tar.bz2";
     sha256 = "1zh5jfh7pyhyz5fbzcgzyckdg0ny7sf8s16yy6rjw9n021zz5i7m";
   };
 
diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 22b808b71aac..98dd7d8fb8ea 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -20,8 +20,6 @@ rec {
     http://kent.dl.sourceforge.net/sourceforge/
   ];
 
-  sf = sourceforge;
-
   # GNU (http://www.gnu.org/prep/ftp.html).
   gnu = [
     # This one redirects to a (supposedly) nearby and (supposedly) up-to-date
diff --git a/pkgs/data/fonts/libertine/default.nix b/pkgs/data/fonts/libertine/default.nix
index 514690cb0cd2..b8c0db222d5f 100644
--- a/pkgs/data/fonts/libertine/default.nix
+++ b/pkgs/data/fonts/libertine/default.nix
@@ -2,7 +2,7 @@ args: with args; rec {
   name = "linux-libertine-5.3.0";
 
   src = fetchurl {
-    url = mirror://sf/linuxlibertine/5.3.0/LinLibertineSRC_5.3.0_2012_07_02.tgz;
+    url = mirror://sourceforge/linuxlibertine/5.3.0/LinLibertineSRC_5.3.0_2012_07_02.tgz;
     sha256 = "0x7cz6hvhpil1rh03rax9zsfzm54bh7r4bbrq8rz673gl9h47v0v";
   };
 
diff --git a/pkgs/development/libraries/clucene-core/default.nix b/pkgs/development/libraries/clucene-core/default.nix
index d180c4761e88..abd6712736f5 100644
--- a/pkgs/development/libraries/clucene-core/default.nix
+++ b/pkgs/development/libraries/clucene-core/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "clucene-core-0.9.21b";
 
   src = fetchurl {
-    url = "mirror://sf/clucene/${name}.tar.bz2";
+    url = "mirror://sourceforge/clucene/${name}.tar.bz2";
     sha256 = "202ee45af747f18642ae0a088d7c4553521714a511a1a9ec99b8144cf9928317";
   };
   
diff --git a/pkgs/development/libraries/cppunit/default.nix b/pkgs/development/libraries/cppunit/default.nix
index dbbcf4388c5a..2504f87a230a 100644
--- a/pkgs/development/libraries/cppunit/default.nix
+++ b/pkgs/development/libraries/cppunit/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "cppunit-1.12.0";
 
   src = fetchurl {
-    url = mirror://sf/cppunit/cppunit-1.12.0.tar.gz;
+    url = mirror://sourceforge/cppunit/cppunit-1.12.0.tar.gz;
     sha256 = "07zyyx5dyai94y8r8va28971f5mw84mb93xx9pm6m4ddpj6c79cq";
   };
 
diff --git a/pkgs/development/libraries/hunspell/default.nix b/pkgs/development/libraries/hunspell/default.nix
index c5243bc63930..04be58eb50a6 100644
--- a/pkgs/development/libraries/hunspell/default.nix
+++ b/pkgs/development/libraries/hunspell/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "hunspell-1.3.2";
 
   src = fetchurl {
-    url = "mirror://sf/hunspell/${name}.tar.gz";
+    url = "mirror://sourceforge/hunspell/${name}.tar.gz";
     sha256 = "1gfxdajnqk2civkshkfjx5ldg7kjdgj76m5khpsbjk4lxsjd9vdl";
   };
 
diff --git a/pkgs/development/libraries/indilib/default.nix b/pkgs/development/libraries/indilib/default.nix
index 9fc5ac665e8b..31cbe772916d 100644
--- a/pkgs/development/libraries/indilib/default.nix
+++ b/pkgs/development/libraries/indilib/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "indilib-0.8";
 
   src = fetchurl {
-    url = mirror://sf/indi/libindi_0.8.tar.gz;
+    url = mirror://sourceforge/indi/libindi_0.8.tar.gz;
     sha256 = "d5ed14a5de6fd6e5db15463ada96c2b15b53e84a1ffe199b76f70128493f2a65";
   };
 
diff --git a/pkgs/development/libraries/libnova/default.nix b/pkgs/development/libraries/libnova/default.nix
index e24a93c10439..28decb9cfca0 100644
--- a/pkgs/development/libraries/libnova/default.nix
+++ b/pkgs/development/libraries/libnova/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "libnova-0.12.1";
 	
   src = fetchurl {
-    url = "mirror://sf/libnova/${name}.tar.gz";
+    url = "mirror://sourceforge/libnova/${name}.tar.gz";
     sha256 = "0bs6c45q4qkrns36qndl8vns5gvhgpd90hi68bhah4r4hrg48lw0";
   };
   
diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix
index 9c75bd51db14..bf1a1e232bb6 100644
--- a/pkgs/development/libraries/libqalculate/default.nix
+++ b/pkgs/development/libraries/libqalculate/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "libqalculate-0.9.7";
 
   src = fetchurl {
-    url = "mirror://sf/qalculate/${name}.tar.gz";
+    url = "mirror://sourceforge/qalculate/${name}.tar.gz";
     sha256 = "0mbrc021dk0ayyglk4qyf9328cayrlz2q94lh8sh9l9r6g79fvcs";
   };
 
diff --git a/pkgs/development/libraries/libxklavier/default.nix b/pkgs/development/libraries/libxklavier/default.nix
index 419f9a497c08..b50399d4f108 100644
--- a/pkgs/development/libraries/libxklavier/default.nix
+++ b/pkgs/development/libraries/libxklavier/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "libxklavier-5.0";
 
   src = fetchurl {
-    url = "mirror://sf/gswitchit/${name}.tar.bz2";
+    url = "mirror://sourceforge/gswitchit/${name}.tar.bz2";
     sha256 = "1c2dxinjfpq1lzxi0z46r0j80crbmwb0lkvnh6987cjjlwblpnfz";
   };
 
diff --git a/pkgs/development/libraries/qimageblitz/default.nix b/pkgs/development/libraries/qimageblitz/default.nix
index 4aac06a51014..5800b562e6b0 100644
--- a/pkgs/development/libraries/qimageblitz/default.nix
+++ b/pkgs/development/libraries/qimageblitz/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   name = "${pn}-${v}";
   
   src = fetchurl {
-    url = "mirror://sf/${pn}/${pn}-${v}.tar.bz2";
+    url = "mirror://sourceforge/${pn}/${pn}-${v}.tar.bz2";
     sha256 = "0pnaf3qi7rgkxzs2mssmslb3f9ya4cyx09wzwlis3ppyvf72j0p9";
   };
   
diff --git a/pkgs/development/libraries/qjson/default.nix b/pkgs/development/libraries/qjson/default.nix
index a4b146ff424f..af960c1b9933 100644
--- a/pkgs/development/libraries/qjson/default.nix
+++ b/pkgs/development/libraries/qjson/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "qjson-0.7.1";
 
   src = fetchurl {
-    url = "mirror://sf/qjson/${name}.tar.bz2";
+    url = "mirror://sourceforge/qjson/${name}.tar.bz2";
     sha256 = "155r7nypgnsvjc6w3q51zmjchpqxi4c3azad9cf1fip8bws993iv";
   };
 
diff --git a/pkgs/development/libraries/science/math/atlas/default.nix b/pkgs/development/libraries/science/math/atlas/default.nix
index 2cca8d7d9c44..75f9de5e96a2 100644
--- a/pkgs/development/libraries/science/math/atlas/default.nix
+++ b/pkgs/development/libraries/science/math/atlas/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
   name = "atlas-3.9.67";
 
   src = fetchurl {
-    url = mirror://sf/math-atlas/atlas3.9.67.tar.bz2;
+    url = mirror://sourceforge/math-atlas/atlas3.9.67.tar.bz2;
     sha256 = "06xxlv440z8a3qmfrh17p28girv71c6awvpw5vhpspr0pcsgk1pa";
   };
 
diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix
index 6e67ce660f14..a9fe9d596c78 100644
--- a/pkgs/games/uqm/default.nix
+++ b/pkgs/games/uqm/default.nix
@@ -8,22 +8,22 @@ stdenv.mkDerivation rec {
   version = "0.7.0";
 
   src = fetchurl {
-    url = "mirror://sf/sc2/uqm-${version}-source.tgz";
+    url = "mirror://sourceforge/sc2/uqm-${version}-source.tgz";
     sha256 = "a3695c5f7f0be7ec9c0f80ec569907b382023a1fee6e635532bd53b7b53bb221";
   };
 
   content = fetchurl {
-    url = "mirror://sf/sc2/uqm-${version}-content.uqm";
+    url = "mirror://sourceforge/sc2/uqm-${version}-content.uqm";
     sha256 = "b8f6db8ba29f0628fb1d5c233830896b19f441aee3744bda671ea264b44da3bf";
   };
 
   voice = fetchurl {
-    url = "mirror://sf/sc2/uqm-${version}-voice.uqm";
+    url = "mirror://sourceforge/sc2/uqm-${version}-voice.uqm";
     sha256 = "bcccf801b4ba37594ff6217b292744ea586ee2d447e927804842ccae8b73c979";
   };
 
   music = fetchurl {
-    url = "mirror://sf/sc2/uqm-${version}-3domusic.uqm";
+    url = "mirror://sourceforge/sc2/uqm-${version}-3domusic.uqm";
     sha256 = "c57085e64dad4bddf8a679a9aa2adf63f2156d5f6cbabe63af80519033dbcb82";
   };
 
diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix
index 42119208f125..6bb44d7db449 100644
--- a/pkgs/os-specific/linux/acpi/default.nix
+++ b/pkgs/os-specific/linux/acpi/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.6";
 
   src = fetchurl {
-    url = "mirror://sf/acpiclient/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/acpiclient/${version}/${name}.tar.gz";
     sha256 = "0cawznhkzb51yxa599d1xkw05nklmjrrmd79vmjkkzf4002d4qgd";
   };
 
diff --git a/pkgs/servers/mail/freepops/default.nix b/pkgs/servers/mail/freepops/default.nix
index d58660297623..c80d0f04bda9 100644
--- a/pkgs/servers/mail/freepops/default.nix
+++ b/pkgs/servers/mail/freepops/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "freepops-0.2.9";
   src = fetchurl {
-    url = mirror://sf/freepops/0.2.9/freepops-0.2.9.tar.gz;
+    url = mirror://sourceforge/freepops/0.2.9/freepops-0.2.9.tar.gz;
     sha256 = "3a065e30cafed03d9b6fdb28251ae5bf0d8aeb62181746154beecd25dc0c9cae";
   };
   buildInputs = [pkgconfig openssl lua5 curl readline bison expat];
diff --git a/pkgs/tools/misc/ised/default.nix b/pkgs/tools/misc/ised/default.nix
index f5f9112639c5..0a04886f64c6 100644
--- a/pkgs/tools/misc/ised/default.nix
+++ b/pkgs/tools/misc/ised/default.nix
@@ -12,7 +12,7 @@ let
     baseName="ised";
     version="2.2.2";
     name="${baseName}-${version}";
-    url="mirror://sf/project/ised/${name}.tar.bz2";
+    url="mirror://sourceforge/project/ised/${name}.tar.bz2";
     hash="1nb1cnsbs2k3j9cy2kc2kg01rd7wf3jwxm62rwn1rjlc46nwdlmn";
   };
 in