Updated TeXLive source URLs. Converted everything to mirror://debian, switched to dfsg.1.orig where orig unavailable

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

6 files changed, 8 insertions, 7 deletions

diff --git a/pkgs/misc/tex/texlive/beamer.nix b/pkgs/misc/tex/texlive/beamer.nix
index ab960a5ca762..abeecffb5302 100644
--- a/pkgs/misc/tex/texlive/beamer.nix
+++ b/pkgs/misc/tex/texlive/beamer.nix
@@ -2,7 +2,7 @@ args: with args;
 rec {
   name = "texlive-beamer-2007";
   src = fetchurl {
-    url = http://ftp.de.debian.org/debian/pool/main/l/latex-beamer/latex-beamer_3.07.orig.tar.gz;
+    url = mirror://debian/pool/main/l/latex-beamer/latex-beamer_3.07.orig.tar.gz;
     sha256 = "07ldhg5f0hcnhjgzg5g8ailqacn8zhqc8nl2jkxc43c2qxbvswbv";
   };
 
diff --git a/pkgs/misc/tex/texlive/cm-super.nix b/pkgs/misc/tex/texlive/cm-super.nix
index 1844f2672255..19c8b5566b90 100644
--- a/pkgs/misc/tex/texlive/cm-super.nix
+++ b/pkgs/misc/tex/texlive/cm-super.nix
@@ -2,7 +2,7 @@ args: with args;
 rec {
   name = "texlive-cm-super-2007";
   src = fetchurl {
-    url = ftp://195.178.192.118/debian/pool/main/c/cm-super/cm-super_0.3.3.orig.tar.gz;
+    url = mirror://debian/pool/main/c/cm-super/cm-super_0.3.3.orig.tar.gz;
     sha256 = "1lxvnhqds2zi6ssz66r1b7s6p855lab7cgp0hdg247zkacbjxcfg";
   };
 
diff --git a/pkgs/misc/tex/texlive/default.nix b/pkgs/misc/tex/texlive/default.nix
index d515a4521983..1714effb72c0 100644
--- a/pkgs/misc/tex/texlive/default.nix
+++ b/pkgs/misc/tex/texlive/default.nix
@@ -1,8 +1,8 @@
 args : with args; 
 rec {
   src = fetchurl { 
-    url = mirror://debian/pool/main/t/texlive-bin/texlive-bin_2007.orig.tar.gz;
-    sha256 = "1fz5lqbigdrdg0pmaynissd7wn59p2yj9f203nl93dcpffrapxjv";
+    url = mirror://debian/pool/main/t/texlive-bin/texlive-bin_2007.dfsg.1.orig.tar.gz;
+    sha256 = "17wdn9vl4pa897046jpzxl6bl2ppr7swwb8x0jafwvbcnmywndag";
   };
   
   texmfSrc = fetchurl { 
@@ -81,3 +81,4 @@ rec {
     srcs = [texmfSrc langTexmfSrc];
   };
 }
+
diff --git a/pkgs/misc/tex/texlive/extra.nix b/pkgs/misc/tex/texlive/extra.nix
index d67c02e7d929..296073fa5aa7 100644
--- a/pkgs/misc/tex/texlive/extra.nix
+++ b/pkgs/misc/tex/texlive/extra.nix
@@ -2,7 +2,7 @@ args: with args;
 rec {
   name = "texlive-extra-2007";
   src = fetchurl {
-    url = ftp://ftp.ru.debian.org/debian/pool/main/t/texlive-extra/texlive-extra_2007.dfsg.1.orig.tar.gz;
+    url = mirror://debian/pool/main/t/texlive-extra/texlive-extra_2007.dfsg.1.orig.tar.gz;
     sha256 = "1440495dcsrwhnz1p1prs4rf84ca0v7fjwg7sdw7isnprnpiq7w5";
   };
 
diff --git a/pkgs/misc/tex/texlive/pgf.nix b/pkgs/misc/tex/texlive/pgf.nix
index 3e7b5fc7fbcc..5e30740f6943 100644
--- a/pkgs/misc/tex/texlive/pgf.nix
+++ b/pkgs/misc/tex/texlive/pgf.nix
@@ -2,7 +2,7 @@ args: with args;
 rec {
   name = "texlive-pgf-2007";
   src = fetchurl {
-    url = http://ftp.de.debian.org/debian/pool/main/p/pgf/pgf_1.18.orig.tar.gz;
+    url = mirror://debian/pool/main/p/pgf/pgf_1.18.orig.tar.gz;
     sha256 = "1fk0m3rqsgdrxp2n6mbhh92819g1133w67lbgk66pqgspbrnk6h2";
   };
 
diff --git a/pkgs/misc/tex/texlive/xcolor.nix b/pkgs/misc/tex/texlive/xcolor.nix
index df9eb70689f8..dcbbbcb8af6c 100644
--- a/pkgs/misc/tex/texlive/xcolor.nix
+++ b/pkgs/misc/tex/texlive/xcolor.nix
@@ -2,7 +2,7 @@ args: with args;
 rec {
   name = "texlive-latex-xcolor-2007";
   src = fetchurl {
-    url = http://ftp.de.debian.org/debian/pool/main/l/latex-xcolor/latex-xcolor_2.11.orig.tar.gz;
+    url = mirror://debian/pool/main/l/latex-xcolor/latex-xcolor_2.11.orig.tar.gz;
     sha256 = "0z78xfn5iq5ncg82sd6v2qrxs8p9hs3m4agaz90p4db5dvk2w0mn";
   };