diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-06-18 12:07:31 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-18 12:07:31 +0200 |
commit | f6f0b937b3fbb685d676a903af8c61a12b699516 (patch) | |
tree | 202d6369482a3a683cfb83927ef1d9e84136c6b6 /pkgs/development/libraries | |
parent | cddff1d7a280a7d7feb27c722105f225eee90375 (diff) | |
parent | 492e221ff92150bd7b2a6ba7a919e43f4c4e3d8b (diff) | |
download | nixpkgs-f6f0b937b3fbb685d676a903af8c61a12b699516.tar nixpkgs-f6f0b937b3fbb685d676a903af8c61a12b699516.tar.gz nixpkgs-f6f0b937b3fbb685d676a903af8c61a12b699516.tar.bz2 nixpkgs-f6f0b937b3fbb685d676a903af8c61a12b699516.tar.lz nixpkgs-f6f0b937b3fbb685d676a903af8c61a12b699516.tar.xz nixpkgs-f6f0b937b3fbb685d676a903af8c61a12b699516.tar.zst nixpkgs-f6f0b937b3fbb685d676a903af8c61a12b699516.zip |
Merge pull request #127172 from paperdigits/exiv2-update
exiv2: 0.27.3 -> 0.27.4
Diffstat (limited to 'pkgs/development/libraries')
-rw-r--r-- | pkgs/development/libraries/exiv2/default.nix | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/pkgs/development/libraries/exiv2/default.nix b/pkgs/development/libraries/exiv2/default.nix index 9d29afd6927..2a394f8279b 100644 --- a/pkgs/development/libraries/exiv2/default.nix +++ b/pkgs/development/libraries/exiv2/default.nix @@ -1,6 +1,5 @@ { lib, stdenv , fetchFromGitHub -, fetchpatch , zlib , expat , cmake @@ -15,7 +14,7 @@ stdenv.mkDerivation rec { pname = "exiv2"; - version = "0.27.3"; + version = "0.27.4"; outputs = [ "out" "dev" "doc" "man" ]; @@ -23,30 +22,9 @@ stdenv.mkDerivation rec { owner = "exiv2"; repo = "exiv2"; rev = "v${version}"; - sha256 = "0d294yhcdw8ziybyd4rp5hzwknzik2sm0cz60ff7fljacv75bjpy"; + sha256 = "0m1x79q6i5fw3gr9k0dw0bbl7ym27g9vbmxiamks6yw028xqwc5a"; }; - patches = [ - # Fix aarch64 build https://github.com/Exiv2/exiv2/pull/1271 - (fetchpatch { - name = "cmake-fix-aarch64.patch"; - url = "https://github.com/Exiv2/exiv2/commit/bbe0b70840cf28b7dd8c0b7e9bb1b741aeda2efd.patch"; - sha256 = "13zw1mn0ag0jrz73hqjhdsh1img7jvj5yddip2k2sb5phy04rzfx"; - }) - - # Use correct paths with multiple outputs - # https://github.com/Exiv2/exiv2/pull/1275 - (fetchpatch { - url = "https://github.com/Exiv2/exiv2/commit/48f2c9dbbacc0ef84c8ebf4cb1a603327f0b8750.patch"; - sha256 = "vjB3+Ld4c/2LT7nq6uatYwfHTh+HeU5QFPFXuNLpIPA="; - }) - # https://github.com/Exiv2/exiv2/pull/1294 - (fetchpatch { - url = "https://github.com/Exiv2/exiv2/commit/306c8a6fd4ddd70e76043ab255734720829a57e8.patch"; - sha256 = "0D/omxYxBPGUu3uSErlf48dc6Ukwc2cEN9/J3e7a9eU="; - }) - ]; - nativeBuildInputs = [ cmake doxygen |