nixos.org/tarballs -> tarballs.nixos.org

It's currently the same machine, but tarballs.nixos.org should become an S3/CloudFront site eventually.
2013-06-25 14:05:48 +02:00 · 2013-06-25 14:05:48 +02:00 · acba9240cd
commit acba9240cd
parent cbf2526bfd
46 changed files with 52 additions and 52 deletions
--- a/doc/release-notes.xml
+++ b/doc/release-notes.xml
@ -237,12 +237,12 @@ fetchurl {

  <function>fetchurl</function> will first try to download this file
  from <link
-  xlink:href="http://nixos.org/tarballs/sha1/eb72f55e4a8bf08e8c6ef227c0ade3d068ba1082"/>.
+  xlink:href="http://tarballs.nixos.org/sha1/eb72f55e4a8bf08e8c6ef227c0ade3d068ba1082"/>.
  If that file doesn’t exist, it will try the original URL.  In
  general, the “content-addressed” location is
  <replaceable>mirror</replaceable><literal>/</literal><replaceable>hash-type</replaceable><literal>/</literal><replaceable>hash</replaceable>.
  There is currently only one content-addressable mirror (<link
-  xlink:href="http://nixos.org/tarballs"/>), but more can be
+  xlink:href="http://tarballs.nixos.org"/>), but more can be
  specified in the <varname>hashedMirrors</varname> attribute in
  <filename>pkgs/build-support/fetchurl/mirrors.nix</filename>, or by
  setting the <envar>NIX_HASHED_MIRRORS</envar> environment variable
--- a/pkgs/applications/editors/emacs-modes/cua/default.nix
+++ b/pkgs/applications/editors/emacs-modes/cua/default.nix
@ -2,7 +2,7 @@
  name = "cua-mode-2.10";
  builder = ./builder.sh;
  src = fetchurl {
-    url = http://nixos.org/tarballs/cua-mode-2.10.el;
+    url = http://tarballs.nixos.org/cua-mode-2.10.el;
    md5 = "5bf5e43f5f38c8383868c7c6c5baca09";
  };
 }
--- a/pkgs/applications/editors/monodevelop/default.nix
+++ b/pkgs/applications/editors/monodevelop/default.nix
@ -10,7 +10,7 @@ stdenv.mkDerivation {
  builder = ./builder.sh;

  src = fetchurl {
-    url = http://nixos.org/tarballs/monodevelop-0.6-pre2315.tar.bz2;
+    url = http://tarballs.nixos.org/monodevelop-0.6-pre2315.tar.bz2;
    md5 = "8c33df5629b0676b7ab552854c1de6fd";
  };

--- a/pkgs/applications/editors/monodoc/default.nix
+++ b/pkgs/applications/editors/monodoc/default.nix
@ -5,7 +5,7 @@ stdenv.mkDerivation {

  builder = ./builder.sh;
  src = fetchurl {
-    url = http://nixos.org/tarballs/monodoc-1.0.6.tar.gz;
+    url = http://tarballs.nixos.org/monodoc-1.0.6.tar.gz;
    md5 = "f2fc27e8e4717d90dc7efa2450625693";
  };

--- a/pkgs/applications/graphics/batik/default.nix
+++ b/pkgs/applications/graphics/batik/default.nix
@ -4,7 +4,7 @@ stdenv.mkDerivation {
  name = "batik-1.6";
  builder = ./builder.sh;
  src = fetchurl {
-    url = http://nixos.org/tarballs/batik-1.6.zip;
+    url = http://tarballs.nixos.org/batik-1.6.zip;
    md5 = "edff288fc64f968ff96ca49763d50f3c";
  };

--- a/pkgs/applications/graphics/f-spot/default.nix
+++ b/pkgs/applications/graphics/f-spot/default.nix
@ -12,7 +12,7 @@ stdenv.mkDerivation {
  inherit makeWrapper;

  src = fetchurl {
-    url = http://nixos.org/tarballs/f-spot-0.0.10.tar.bz2;
+    url = http://tarballs.nixos.org/f-spot-0.0.10.tar.bz2;
    md5 = "19cc6e067ccc261b0502ff6189b79832";
  };

--- a/pkgs/applications/video/mplayer/default.nix
+++ b/pkgs/applications/video/mplayer/default.nix
@ -79,7 +79,7 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    # Old kind of URL:
-    # url = http://nixos.org/tarballs/mplayer-snapshot-20101227.tar.bz2;
+    # url = http://tarballs.nixos.org/mplayer-snapshot-20101227.tar.bz2;
    # Snapshot I took on 20110423

    #Transient
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@ -91,7 +91,7 @@ stdenv.mkDerivation {
  urls = urls_;

  # If set, prefer the content-addressable mirrors
-  # (http://nixos.org/tarballs) over the original URLs.
+  # (http://tarballs.nixos.org) over the original URLs.
  preferHashedMirrors = true;

  # New-style output content requirements.
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@ -2,7 +2,7 @@ rec {

  # Content-addressable Nix mirrors.
  hashedMirrors = [
-    http://nixos.org/tarballs
+    http://tarballs.nixos.org
  ];

  # Mirrors for mirror://site/filename URIs, where "site" is
--- a/pkgs/data/fonts/bakoma-ttf/default.nix
+++ b/pkgs/data/fonts/bakoma-ttf/default.nix
@ -4,7 +4,7 @@ stdenv.mkDerivation {
  name = "bakoma-ttf";
  
  src = fetchurl {
-    url = http://nixos.org/tarballs/bakoma-ttf.tar.bz2;
+    url = http://tarballs.nixos.org/bakoma-ttf.tar.bz2;
    sha256 = "1j1y3cq6ys30m734axc0brdm2q9n2as4h32jws15r7w5fwr991km";
  };
  
--- a/pkgs/data/misc/cacert/default.nix
+++ b/pkgs/data/misc/cacert/default.nix
@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
  name = "cacert-20121229";

  src = fetchurl {
-    url = "http://nixos.org/tarballs/${name}.pem.bz2";
+    url = "http://tarballs.nixos.org/${name}.pem.bz2";
    sha256 = "031s86pqvn620zkj6w97hqgjvkp6vsvlymzz7rwvkv25zvrjsgif";
  };

--- a/pkgs/development/compilers/ghc/6.4.2-binary.nix
+++ b/pkgs/development/compilers/ghc/6.4.2-binary.nix
@ -6,7 +6,7 @@ stdenv.mkDerivation {
  src =
    if stdenv.system == "i686-linux" then
      fetchurl {
-        url = http://nixos.org/tarballs/ghc-6.4.2-i386-unknown-linux.tar.bz2;
+        url = http://tarballs.nixos.org/ghc-6.4.2-i386-unknown-linux.tar.bz2;
        md5 = "092fe2e25dab22b926babe97cc77db1f";
      }
    else if stdenv.system == "x86_64-linux" then
--- a/pkgs/development/compilers/ocaml/3.08.0.nix
+++ b/pkgs/development/compilers/ocaml/3.08.0.nix
@ -4,7 +4,7 @@ stdenv.mkDerivation {
  name = "ocaml-3.08.0";
  builder = ./builder.sh;
  src = fetchurl {
-    url = http://nixos.org/tarballs/ocaml-3.08.0.tar.gz;
+    url = http://tarballs.nixos.org/ocaml-3.08.0.tar.gz;
    md5 = "c6ef478362295c150101cdd2efcd38e0";
  };
  configureScript = ./configure-3.08.0;
--- a/pkgs/development/compilers/openjdk/bootstrap.nix
+++ b/pkgs/development/compilers/openjdk/bootstrap.nix
@ -4,12 +4,12 @@ let
  # !!! These should be on nixos.org
  src = if glibc.system == "x86_64-linux" then
    fetchurl {
-      url = http://nixos.org/tarballs/openjdk-bootstrap-x86_64-linux-2012-08-24.tar.xz;
+      url = http://tarballs.nixos.org/openjdk-bootstrap-x86_64-linux-2012-08-24.tar.xz;
      sha256 = "0gla9dxrfq2w1hvgsnn8jg8a60k27im6z43a6iidi0qmwa0wah32";
    }
  else if glibc.system == "i686-linux" then
    fetchurl {
-      url = http://nixos.org/tarballs/openjdk-bootstrap-i686-linux-2012-08-24.tar.xz;
+      url = http://tarballs.nixos.org/openjdk-bootstrap-i686-linux-2012-08-24.tar.xz;
      sha256 = "184wq212bycwbbq4ix8cc6jwjxkrqw9b01zb86q95kqpa8zy5206";
    }
  else throw "No bootstrap for system";
--- a/pkgs/development/compilers/qcmm/default.nix
+++ b/pkgs/development/compilers/qcmm/default.nix
@ -2,7 +2,7 @@
 stdenv.mkDerivation {
  name = "qcmm-2006-01-31";
  src = fetchurl {
-    url = http://nixos.org/tarballs/qc--20060131.tar.gz;
+    url = http://tarballs.nixos.org/qc--20060131.tar.gz;
    md5 = "9097830775bcf22c9bad54f389f5db23";
  };
  buildInputs = [ mk ocaml noweb groff ];
--- a/pkgs/development/libraries/db4/db4-4.4.nix
+++ b/pkgs/development/libraries/db4/db4-4.4.nix
@ -8,7 +8,7 @@ stdenv.mkDerivation {
  src = fetchurl {
    urls = [
      http://download.oracle.com/berkeley-db/db-4.4.20.NC.tar.gz
-      http://nixos.org/tarballs/db-4.4.20.NC.tar.gz
+      http://tarballs.nixos.org/db-4.4.20.NC.tar.gz
    ];
    md5 = "afd9243ea353bbaa04421488d3b37900";
  };
--- a/pkgs/development/libraries/gtk-sharp-1/default.nix
+++ b/pkgs/development/libraries/gtk-sharp-1/default.nix
@ -19,7 +19,7 @@ stdenv.mkDerivation {

  builder = ./builder.sh;
  src = fetchurl {
-    url = http://nixos.org/tarballs/gtk-sharp-1.0.6.tar.gz;
+    url = http://tarballs.nixos.org/gtk-sharp-1.0.6.tar.gz;
    md5 = "2651d14fe77174ab20b8af53d150ee11";
  };

--- a/pkgs/development/libraries/gtkmozembed-sharp/default.nix
+++ b/pkgs/development/libraries/gtkmozembed-sharp/default.nix
@ -5,7 +5,7 @@ stdenv.mkDerivation {

  builder = ./builder.sh;
  src = fetchurl {
-    url = http://nixos.org/tarballs/gtkmozembed-sharp-0.7-pre41601.tar.bz2;
+    url = http://tarballs.nixos.org/gtkmozembed-sharp-0.7-pre41601.tar.bz2;
    md5 = "34aac139377296791acf3af9b5dc27ed";
  };

--- a/pkgs/development/libraries/gtksourceview-sharp/default.nix
+++ b/pkgs/development/libraries/gtksourceview-sharp/default.nix
@ -5,7 +5,7 @@ stdenv.mkDerivation {

  builder = ./builder.sh;
  src = fetchurl {
-    url = http://nixos.org/tarballs/gtksourceview-sharp-0.6-pre40261.tar.bz2;
+    url = http://tarballs.nixos.org/gtksourceview-sharp-0.6-pre40261.tar.bz2;
    md5 = "8bc26c182bd897f50988e110a9a11f34";
  };

--- a/pkgs/development/libraries/imlib/default.nix
+++ b/pkgs/development/libraries/imlib/default.nix
@ -3,7 +3,7 @@
 stdenv.mkDerivation {
  name = "imlib-1.9.15";
  src = fetchurl {
-    url = http://nixos.org/tarballs/imlib-1.9.15.tar.gz;
+    url = http://tarballs.nixos.org/imlib-1.9.15.tar.gz;
    md5 = "2a5561457e7f8b2e04d88f73508fd13a";
  };

--- a/pkgs/development/libraries/java/jakarta-bcel/default.nix
+++ b/pkgs/development/libraries/java/jakarta-bcel/default.nix
@ -5,7 +5,7 @@ stdenv.mkDerivation {
  builder = ./builder.sh;

  src = fetchurl {
-    url = http://nixos.org/tarballs/bcel-5.1.tar.gz;
+    url = http://tarballs.nixos.org/bcel-5.1.tar.gz;
    md5 = "318f22e4f5f59b68cd004db83a7d65dc";
  };

--- a/pkgs/development/libraries/java/jakarta-regexp/default.nix
+++ b/pkgs/development/libraries/java/jakarta-regexp/default.nix
@ -8,7 +8,7 @@ stdenv.mkDerivation {
  builder = ./java-bin-builder.sh;

  src = fetchurl {
-    url = http://nixos.org/tarballs/jakarta-regexp-1.4.tar.gz;
+    url = http://tarballs.nixos.org/jakarta-regexp-1.4.tar.gz;
    md5 = "d903d84c949df848009f3bf205b32c97";
  };

--- a/pkgs/development/libraries/pdf2xml/default.nix
+++ b/pkgs/development/libraries/pdf2xml/default.nix
@ -4,7 +4,7 @@ stdenv.mkDerivation {
  name = "pdf2xml";
  
  src = fetchurl {
-      url = http://nixos.org/tarballs/pdf2xml.tar.gz;
+      url = http://tarballs.nixos.org/pdf2xml.tar.gz;
      sha256 = "04rl7ppxqgnvxvvws669cxp478lnrdmiqj0g3m4p69bawfjc4z3w";
  };
  sourceRoot = "pdf2xml/pdf2xml";
--- a/pkgs/development/tools/build-managers/gnumake-3.80/default.nix
+++ b/pkgs/development/tools/build-managers/gnumake-3.80/default.nix
@ -3,7 +3,7 @@
 stdenv.mkDerivation {
  name = "gnumake-3.80";
  src = fetchurl {
-    url = http://nixos.org/tarballs/make-3.80.tar.bz2;
+    url = http://tarballs.nixos.org/make-3.80.tar.bz2;
    md5 = "0bbd1df101bc0294d440471e50feca71";
  };
  patches = [./log.patch];
--- a/pkgs/development/tools/build-managers/mk/default.nix
+++ b/pkgs/development/tools/build-managers/mk/default.nix
@ -3,7 +3,7 @@
 stdenv.mkDerivation {
  name = "mk-2006-01-31";
  src = fetchurl {
-    url = http://nixos.org/tarballs/mk-20060131.tar.gz;
+    url = http://tarballs.nixos.org/mk-20060131.tar.gz;
    md5 = "167fd4e0eea4f49def01984ec203289b";
  };
  builder = ./builder.sh;
--- a/pkgs/games/keen4/default.nix
+++ b/pkgs/games/keen4/default.nix
@ -5,7 +5,7 @@ stdenv.mkDerivation {
  builder = ./builder.sh;

  dist = fetchurl {
-    url = http://nixos.org/tarballs/keen4.zip;
+    url = http://tarballs.nixos.org/keen4.zip;
    md5 = "ffcdd9e3bce224d92797166bc3f56f1c";
  };

--- a/pkgs/games/quake3/demo/default.nix
+++ b/pkgs/games/quake3/demo/default.nix
@ -6,13 +6,13 @@ stdenv.mkDerivation {

  # This is needed for pak0.pk3.
  demo = fetchurl {
-    url = http://nixos.org/tarballs/linuxq3ademo-1.11-6.x86.gz.sh;
+    url = http://tarballs.nixos.org/linuxq3ademo-1.11-6.x86.gz.sh;
    md5 = "484610c1ce34272223a52ec331c99d5d";
  };

  # This is needed for the additional pak?.pk3 files.
  update = fetchurl {
-    url = http://nixos.org/tarballs/linuxq3apoint-1.31.x86.run;
+    url = http://tarballs.nixos.org/linuxq3apoint-1.31.x86.run;
    md5 = "2620b9eefb6d0775f766b6570870157a";
  };

--- a/pkgs/os-specific/linux/aufs-util/2.nix
+++ b/pkgs/os-specific/linux/aufs-util/2.nix
@ -8,7 +8,7 @@ stdenv.mkDerivation {
  name = "aufs2-util-${version}-${kernelDev.version}";

  src = fetchurl {
-    url = "http://nixos.org/tarballs/aufs2-util-git-${version}.tar.bz2";
+    url = "http://tarballs.nixos.org/aufs2-util-git-${version}.tar.bz2";
    sha256 = "0ly0c3p8fjxqbk8k5rmm1a91wg8wcrvhi1lv4aawalkkk8rqbnwk";
  };

--- a/pkgs/os-specific/linux/aufs/2.nix
+++ b/pkgs/os-specific/linux/aufs/2.nix
@ -10,7 +10,7 @@ stdenv.mkDerivation {
  src = 
  if (builtins.lessThan (builtins.compareVersions kernelDev.version "2.6.35") 0) then
    fetchurl {
-      url = "http://nixos.org/tarballs/aufs2-standalone-git-${version}.tar.bz2";
+      url = "http://tarballs.nixos.org/aufs2-standalone-git-${version}.tar.bz2";
      sha256 = "1g4mw4qx2xzpygdwjiw36bkhfz1hi7wxx7w79n2h0lr5grzzdnd6";
    }
  else
--- a/pkgs/os-specific/linux/usbutils/default.nix
+++ b/pkgs/os-specific/linux/usbutils/default.nix
@ -4,7 +4,7 @@ let

  # Obtained from http://www.linux-usb.org/usb.ids.bz2.
  usbids = fetchurl {
-    url = http://nixos.org/tarballs/usb.ids.20120920.bz2;
+    url = http://tarballs.nixos.org/usb.ids.20120920.bz2;
    sha256 = "0sz860g7grf6kx22p49s6j8h85c69ymcw16a8110klzfl9hl9hli";
  };

--- a/pkgs/stdenv/linux/bootstrap/armv5tel/default.nix
+++ b/pkgs/stdenv/linux/bootstrap/armv5tel/default.nix
@ -7,7 +7,7 @@
  curl = ./curl.bz2;

  bootstrapTools = {
-    url = "http://nixos.org/tarballs/stdenv-linux/armv5tel/r18744/bootstrap-tools.cpio.bz2";
+    url = "http://tarballs.nixos.org/stdenv-linux/armv5tel/r18744/bootstrap-tools.cpio.bz2";
    sha256 = "1rn4n5kilqmv62dfjfcscbsm0w329k3gyb2v9155fsi1sl2cfzcb";
  };
 }
--- a/pkgs/stdenv/linux/bootstrap/i686/default.nix
+++ b/pkgs/stdenv/linux/bootstrap/i686/default.nix
@ -7,7 +7,7 @@
  curl = ./curl.bz2;

  bootstrapTools = {
-    url = http://nixos.org/tarballs/stdenv-linux/i686/r24519/bootstrap-tools.cpio.bz2;
+    url = http://tarballs.nixos.org/stdenv-linux/i686/r24519/bootstrap-tools.cpio.bz2;
    sha256 = "0imypaxy6piwbk8ff2y1nr7yk49pqmdgdbv6g8miq1zs5yfip6ij";
  };
 }
--- a/pkgs/stdenv/linux/bootstrap/loongson2f/default.nix
+++ b/pkgs/stdenv/linux/bootstrap/loongson2f/default.nix
@ -7,7 +7,7 @@
  curl = ./curl.bz2;

  bootstrapTools = {
-    url = "http://nixos.org/tarballs/stdenv-linux/loongson2f/r22849/cross-bootstrap-tools.cpio.bz2";
+    url = "http://tarballs.nixos.org/stdenv-linux/loongson2f/r22849/cross-bootstrap-tools.cpio.bz2";
    sha256 = "00aavbk76qjj2gdlmpaaj66r8nzl4d7pyl8cv1gigyzgpbr5vv3j";
  };
 }
--- a/pkgs/stdenv/linux/bootstrap/powerpc/default.nix
+++ b/pkgs/stdenv/linux/bootstrap/powerpc/default.nix
@ -6,22 +6,22 @@
  tar = ./tar.bz2;

  staticToolsURL = {
-    url = http://nixos.org/tarballs/stdenv-linux/powerpc/r9828/static-tools.tar.bz2;
+    url = http://tarballs.nixos.org/stdenv-linux/powerpc/r9828/static-tools.tar.bz2;
    sha1 = "e4d1680e3dfa752e49a996a31140db53b10061cb";
  };

  binutilsURL = {
-    url = http://nixos.org/tarballs/stdenv-linux/powerpc/r9828/binutils.tar.bz2;
+    url = http://tarballs.nixos.org/stdenv-linux/powerpc/r9828/binutils.tar.bz2;
    sha1 = "2609f4d9277a60fcd178395d3d49911190e08f36";
  };

  gccURL = {
-    url = http://nixos.org/tarballs/stdenv-linux/powerpc/r9828/gcc.tar.bz2;
+    url = http://tarballs.nixos.org/stdenv-linux/powerpc/r9828/gcc.tar.bz2;
    sha1 = "71d79d736bfef6252208fe6239e528a591becbed";
  };

  glibcURL = {
-    url = http://nixos.org/tarballs/stdenv-linux/powerpc/r9828/glibc.tar.bz2;
+    url = http://tarballs.nixos.org/stdenv-linux/powerpc/r9828/glibc.tar.bz2;
    sha1 = "bf0245e16235800c8aa9c6a5de6565583a66e46d";
  };
 }
--- a/pkgs/stdenv/linux/bootstrap/x86_64/default.nix
+++ b/pkgs/stdenv/linux/bootstrap/x86_64/default.nix
@ -4,7 +4,7 @@

 {
  bootstrapTools = {
-    url = http://nixos.org/tarballs/stdenv-linux/x86_64/r23302/bootstrap-tools.cpio.bz2;
+    url = http://tarballs.nixos.org/stdenv-linux/x86_64/r23302/bootstrap-tools.cpio.bz2;
    sha256 = "0w89kqhx47yl0jifp2vffp073pyrqha5f312kp971smi4h41drna";
  };
 }
--- a/pkgs/tools/filesystems/aefs/default.nix
+++ b/pkgs/tools/filesystems/aefs/default.nix
@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
  name = "aefs-0.4pre259-8843b7c";
  
  src = fetchurl {
-    url = "http://nixos.org/tarballs/${name}.tar.bz2";
+    url = "http://tarballs.nixos.org/${name}.tar.bz2";
    sha256 = "167hp58hmgdavg2mqn5dx1xgq24v08n8d6psf33jhbdabzx6a6zq";
  };

--- a/pkgs/tools/misc/getopt/default.nix
+++ b/pkgs/tools/misc/getopt/default.nix
@ -4,7 +4,7 @@ stdenv.mkDerivation {
  name = "getopt-1.1.4";
  builder = ./builder.sh;
  src = fetchurl {
-    url = http://nixos.org/tarballs/getopt-1.1.4.tar.gz;
+    url = http://tarballs.nixos.org/getopt-1.1.4.tar.gz;
    md5 = "02188ca68da27c4175d6e9f3da732101";
  };
 }
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@ -6,7 +6,7 @@
 let

  hpnSrc = fetchurl {
-    url = http://nixos.org/tarballs/openssh-6.1p1-hpn13v14.diff.gz;
+    url = http://tarballs.nixos.org/openssh-6.1p1-hpn13v14.diff.gz;
    sha256 = "14das6lim6fxxnx887ssw76ywsbvx3s4q3n43afgh5rgvs4xmnnq";
  };

--- a/pkgs/tools/networking/p2p/azureus/default.nix
+++ b/pkgs/tools/networking/p2p/azureus/default.nix
@ -4,7 +4,7 @@ stdenv.mkDerivation {
  name = "azureus-2.3.0.6";
  builder = ./builder.sh;
  src = fetchurl {
-    url = http://nixos.org/tarballs/Azureus2.3.0.6.jar;
+    url = http://tarballs.nixos.org/Azureus2.3.0.6.jar;
    md5 = "84f85b144cdc574338c2c84d659ca620";
  };
 #  buildInputs = [unzip];
--- a/pkgs/tools/security/gnupg1/default.nix
+++ b/pkgs/tools/security/gnupg1/default.nix
@ -8,7 +8,7 @@
 let

  idea = fetchurl {
-    url = http://nixos.org/tarballs/idea.c.gz;
+    url = http://tarballs.nixos.org/idea.c.gz;
    md5 = "9dc3bc086824a8c7a331f35e09a3e57f";
  };

--- a/pkgs/tools/system/pciutils/default.nix
+++ b/pkgs/tools/system/pciutils/default.nix
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {

  pciids = fetchurl {
    # Obtained from http://pciids.sourceforge.net/v2.2/pci.ids.bz2.
-    url = http://nixos.org/tarballs/pci.ids.20120929.bz2;
+    url = http://tarballs.nixos.org/pci.ids.20120929.bz2;
    sha256 = "1q3i479ay88wam1zz1vbgkbqb2axg8av9qjxaigrqbnw2pv0srmb";
  };

--- a/pkgs/tools/text/xml/xpf/default.nix
+++ b/pkgs/tools/text/xml/xpf/default.nix
@ -6,7 +6,7 @@ stdenv.mkDerivation {
  name = "xpf-0.2";
  
  src = fetchurl {
-    url = http://nixos.org/tarballs/xpf-0.2.tar.gz;
+    url = http://tarballs.nixos.org/xpf-0.2.tar.gz;
    md5 = "d92658828139e1495e052d0cfe25d312";
  };
  
--- a/pkgs/tools/typesetting/bibtex-tools/default.nix
+++ b/pkgs/tools/typesetting/bibtex-tools/default.nix
@ -3,7 +3,7 @@
 stdenv.mkDerivation {
  name = "bibtex-tools-0.2pre13026";
  src = fetchurl {
-    url = http://nixos.org/tarballs/bibtex-tools-0.2pre13026.tar.gz;
+    url = http://tarballs.nixos.org/bibtex-tools-0.2pre13026.tar.gz;
    md5 = "2d8a5de7c53eb670307048eb3d14cdd6";
  };
  configureFlags = "
--- a/pkgs/tools/virtualization/ec2-ami-tools/default.nix
+++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix
@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
  buildInputs = [ unzip makeWrapper ];

  src = fetchurl {
-    url = "http://nixos.org/tarballs/${name}.zip";
+    url = "http://tarballs.nixos.org/${name}.zip";
    sha256 = "0icpjr2ipch3f6cf4rg9x5z2y9k6a4rd85npsmw3a1ambs3dwxlq";
  };

--- a/pkgs/tools/virtualization/ec2-api-tools/default.nix
+++ b/pkgs/tools/virtualization/ec2-api-tools/default.nix
@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
  name = "ec2-api-tools-1.6.5.1";

  src = fetchurl {
-    url = "http://nixos.org/tarballs/${name}.zip";
+    url = "http://tarballs.nixos.org/${name}.zip";
    sha256 = "1j2pc20vggi4hv950999mhh7dl6475yma76nyj6k0hzkd1lf5hda";
  };

--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@ -152,7 +152,7 @@ rec {
  ArchiveZip = buildPerlPackage {
    name = "Archive-Zip-1.16";
    src = fetchurl {
-      url = http://nixos.org/tarballs/Archive-Zip-1.16.tar.gz;
+      url = http://tarballs.nixos.org/Archive-Zip-1.16.tar.gz;
      md5 = "e28dff400d07b1659d659d8dde7071f1";
    };
  };