stow: 2.2.0 -> 2.2.2

This commit is contained in:
Marius Bakke 2016-05-30 13:39:29 +01:00 committed by Moritz Ulrich
parent 0c9e904943
commit 8f7b525fc2
2 changed files with 7 additions and 21 deletions

View file

@ -1,16 +1,17 @@
{ stdenv, fetchurl, perl, perlPackages }:
let
version = "2.2.2";
in
stdenv.mkDerivation {
name = "stow-2.2.0";
name = "stow-${version}";
src = fetchurl {
url = mirror://gnu/stow/stow-2.2.0.tar.bz2;
sha256 = "01bbsqjmrnd9925s3grvgjnrl52q4w65imrvzy05qaij3pz31g46";
url = "mirror://gnu/stow/stow-${version}.tar.bz2";
sha256 = "1zd6g9cm3whvy5f87j81j4npl7q6kxl25f7z7p9ahiqfjqs200m0";
};
buildInputs = [ perl perlPackages.TestOutput ];
patches = [ ./precedence-issue.patch ];
buildInputs = with perlPackages; [ perl IOStringy TestOutput ];
doCheck = true;

View file

@ -1,15 +0,0 @@
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");
}