* Fix the download of discontinued openSUSE releases.

svn path=/nixpkgs/trunk/; revision=22324

2 files changed, 14 insertions, 15 deletions

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index b30c29678ce0..ac570fe38b57 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -195,11 +195,10 @@ rec {
 
   # openSUSE.
   opensuse = [
-    http://opensuse.hro.nl/opensuse/
-    http://ftp.funet.fi/pub/linux/mirrors/opensuse/
-    http://ftp5.gwdg.de/pub/opensuse/
-    http://ftp.opensuse.org/pub/opensuse/
-    http://ftp5.gwdg.de/pub/opensuse/discontinued/
+    http://opensuse.hro.nl/opensuse/distribution/
+    http://ftp.funet.fi/pub/linux/mirrors/opensuse/distribution/
+    http://ftp.opensuse.org/pub/opensuse/distribution/
+    http://ftp.hosteurope.de/mirror/ftp.opensuse.org/discontinued/
   ];
 
   # Gnome (see http://ftp.gnome.org/pub/GNOME/MIRRORS).
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index c59b667d590c..a0ca48999607 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -896,10 +896,10 @@ rec {
       name = "opensuse-10.3-i586";
       fullName = "openSUSE 10.3 (i586)";
       packagesList = fetchurl {
-        url = mirror://opensuse/distribution/10.3/repo/oss/suse/repodata/primary.xml.gz;
+        url = mirror://opensuse/10.3/repo/oss/suse/repodata/primary.xml.gz;
         sha256 = "0zb5kxsb755nqq9i8jdclmanacyf551ncx6a011v9jqphsvyfvd7";
       };
-      urlPrefix = mirror://opensuse/distribution/10.3/repo/oss/suse/;
+      urlPrefix = mirror://opensuse/10.3/repo/oss/suse/;
       archs = ["noarch" "i586"];
       packages = commonOpenSUSEPackages ++ [ "devs" ];
     };
@@ -908,10 +908,10 @@ rec {
       name = "opensuse-11.0-i586";
       fullName = "openSUSE 11.0 (i586)";
       packagesList = fetchurl {
-        url = mirror://opensuse/distribution/11.0/repo/oss/suse/repodata/primary.xml.gz;
+        url = mirror://opensuse/11.0/repo/oss/suse/repodata/primary.xml.gz;
         sha256 = "13rv855aj8p3h1zpsji5xa1wpkhgq94gcxzvg05l2b68b15q3mwn";
       };
-      urlPrefix = mirror://opensuse/distribution/11.0/repo/oss/suse/;
+      urlPrefix = mirror://opensuse/11.0/repo/oss/suse/;
       archs = ["noarch" "i586"];
       packages = commonOpenSUSEPackages;
     };
@@ -920,10 +920,10 @@ rec {
       name = "opensuse-11.0-x86_64";
       fullName = "openSUSE 11.0 (x86_64)";
       packagesList = fetchurl {
-        url = mirror://opensuse/distribution/11.0/repo/oss/suse/repodata/primary.xml.gz;
+        url = mirror://opensuse/11.0/repo/oss/suse/repodata/primary.xml.gz;
         sha256 = "13rv855aj8p3h1zpsji5xa1wpkhgq94gcxzvg05l2b68b15q3mwn";
       };
-      urlPrefix = mirror://opensuse/distribution/11.0/repo/oss/suse/;
+      urlPrefix = mirror://opensuse/11.0/repo/oss/suse/;
       archs = ["noarch" "x86_64"];
       packages = commonOpenSUSEPackages;
     };
@@ -932,10 +932,10 @@ rec {
       name = "opensuse-11.1-i586";
       fullName = "openSUSE 11.1 (i586)";
       packagesList = fetchurl {
-        url = mirror://opensuse/distribution/11.1/repo/oss/suse/repodata/primary.xml.gz;
+        url = mirror://opensuse/11.1/repo/oss/suse/repodata/primary.xml.gz;
         sha256 = "1mfmp9afikj0hci1s8cpwjdr0ycbpfym9gdhci590r9fa75w221j";
       };
-      urlPrefix = mirror://opensuse/distribution/11.1/repo/oss/suse/;
+      urlPrefix = mirror://opensuse/11.1/repo/oss/suse/;
       archs = ["noarch" "i586"];
       packages = commonOpenSUSEPackages;
     };
@@ -944,10 +944,10 @@ rec {
       name = "opensuse-11.1-x86_64";
       fullName = "openSUSE 11.1 (x86_64)";
       packagesList = fetchurl {
-        url = mirror://opensuse/distribution/11.1/repo/oss/suse/repodata/primary.xml.gz;
+        url = mirror://opensuse/11.1/repo/oss/suse/repodata/primary.xml.gz;
         sha256 = "1mfmp9afikj0hci1s8cpwjdr0ycbpfym9gdhci590r9fa75w221j";
       };
-      urlPrefix = mirror://opensuse/distribution/11.1/repo/oss/suse/;
+      urlPrefix = mirror://opensuse/11.1/repo/oss/suse/;
       archs = ["noarch" "x86_64"];
       packages = commonOpenSUSEPackages;
     };