Merge branch 'master.upstream' into staging.upstream

2015-06-26 17:25:49 -07:00
parent e130e9d3a3 8ce4cb4de8
commit ef253212f4
53 changed files with 673 additions and 200 deletions
@@ -6,7 +6,10 @@ stdenv.mkDerivation rec {
  buildInputs = [ zlib ];

  src = fetchurl {
-    url = "ftp://ftp.astron.com/pub/file/${name}.tar.gz";
+    urls = [
+      "ftp://ftp.astron.com/pub/file/${name}.tar.gz"
+      "http://distfiles.macports.org/file/${name}.tar.gz"
+    ];
    sha256 = "0z0mwqayrrf3w734rjp9rysf0y8az191ff7fxjsxyb1y2kzv72ic";
  };