From 0a12a50b116b057526e255fbd70ebdd95e17b187 Mon Sep 17 00:00:00 2001
From: Justin Bedo <cu@cua0.org>
Date: Tue, 8 Jul 2014 11:00:41 +1000
Subject: [PATCH 1/2] Removed CRAN mirror that was incorrectly handling 404
 errors, causing builder to abort.

---
 pkgs/build-support/fetchurl/mirrors.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 38d3353202b..92e9ba01b50 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -305,7 +305,6 @@ rec {
     http://dirichlet.mat.puc.cl/
     http://ftp.ctex.org/mirrors/CRAN/
     http://mirror.bjtu.edu.cn/cran
-    http://cran.dataguru.cn/
     http://mirrors.ustc.edu.cn/CRAN/
     http://mirrors.xmu.edu.cn/CRAN/
     http://www.laqee.unal.edu.co/CRAN/

From 57f1baa66d2317eca74cc858507ffe7f4c39ebdc Mon Sep 17 00:00:00 2001
From: Justin Bedo <cu@cua0.org>
Date: Tue, 8 Jul 2014 11:02:05 +1000
Subject: [PATCH 2/2] Added CRAN archive to R package derivation to prevent R
 expressions from breaking when any package is updated.

---
 pkgs/development/r-modules/cran-packages.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/r-modules/cran-packages.nix b/pkgs/development/r-modules/cran-packages.nix
index 3bebd5468e9..3a8624c9493 100644
--- a/pkgs/development/r-modules/cran-packages.nix
+++ b/pkgs/development/r-modules/cran-packages.nix
@@ -44,7 +44,10 @@ let
   derive = { name, version, sha256, depends ? [] }: buildRPackage {
     name = "${name}-${version}";
     src = fetchurl {
-      url = "mirror://cran/src/contrib/${name}_${version}.tar.gz";
+      urls = [
+        "mirror://cran/src/contrib/${name}_${version}.tar.gz"
+        "mirror://cran/src/contrib/Archive/${name}/${name}_${version}.tar.gz"
+      ];
       inherit sha256;
     };
     propagatedBuildInputs = depends;