Merge branch 'master.upstream' into staging.upstream

3 files changed, 21 insertions, 1 deletions

diff --git a/pkgs/tools/misc/file/default.nix b/pkgs/tools/misc/file/default.nix
index f4e89b197e66..e3dc7bcb5337 100644
--- a/pkgs/tools/misc/file/default.nix
+++ b/pkgs/tools/misc/file/default.nix
@@ -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";
   };
 
diff --git a/pkgs/tools/misc/stow/default.nix b/pkgs/tools/misc/stow/default.nix
index a9d8554525bd..6eddcf89b914 100644
--- a/pkgs/tools/misc/stow/default.nix
+++ b/pkgs/tools/misc/stow/default.nix
@@ -10,6 +10,8 @@ stdenv.mkDerivation {
 
   buildInputs = [ perl perlPackages.TestOutput ];
 
+  patches = [ ./precedence-issue.patch ];
+
   doCheck = true;
 
   meta = {
diff --git a/pkgs/tools/misc/stow/precedence-issue.patch b/pkgs/tools/misc/stow/precedence-issue.patch
new file mode 100644
index 000000000000..d9542573bac7
--- /dev/null
+++ b/pkgs/tools/misc/stow/precedence-issue.patch
@@ -0,0 +1,15 @@
+diff --git a/lib/Stow.pm.in b/lib/Stow.pm.in
+index 101a422..f80b1ac 100755
+--- a/lib/Stow.pm.in
++++ b/lib/Stow.pm.in
+@@ -1732,8 +1732,8 @@ sub read_a_link {
+     }
+     elsif (-l $path) {
+         debug(4, "  read_a_link($path): real link");
+-        return readlink $path
+-            or error("Could not read link: $path");
++        my $target = readlink $path or error("Could not read link: $path ($!)");
++        return $target;
+     }
+     internal_error("read_a_link() passed a non link path: $path\n");
+ }