diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix index 6c1ba9a40c63..99d94d3d1a80 100644 --- a/pkgs/development/python-modules/mat2/default.nix +++ b/pkgs/development/python-modules/mat2/default.nix @@ -56,6 +56,12 @@ buildPythonPackage rec { url = "https://0xacab.org/jvoisin/mat2/-/commit/c9be50f968212b01f8d8ad85e59e19c3e67d8578.patch"; sha256 = "0895dkv6575ps3drdfnli15cggx27n9irjx0axigrm4ql4ma0648"; }) + # fix white space error in the tests for exiftool, remove for next release + (fetchpatch { + name = "fix-tests-exiftool.patch"; + url = "https://0xacab.org/jvoisin/mat2/-/commit/6df615281b2a649b85ff7670f6d87d3beed0b977.patch"; + sha256 = "1gix63n0mzavnqjq5ll0v210z4vdz4f93aq03bfzlgifxcd9vl1x"; + }) ]; postPatch = '' diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5ec39ab41f07..ff35e5231463 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10793,25 +10793,15 @@ let }; }; - ImageExifTool = buildPerlPackage { + ImageExifTool = buildPerlPackage rec { pname = "Image-ExifTool"; - version = "12.16"; + version = "12.29"; src = fetchurl { - url = "mirror://cpan/authors/id/E/EX/EXIFTOOL/Image-ExifTool-12.16.tar.gz"; - sha256 = "0skm22b3gg1bfk0amklrprpva41m6mkrhqp0gi7z1nmcf9ypjh61"; + url = "https://exiftool.org/Image-ExifTool-${version}.tar.gz"; + sha256 = "09yszwhirprqr94jwrsr9kyav5syv0mjmnjngqn20fn7m135wv95"; }; - patches = [ - # Unfortunately, not every release is uploaded to CPAN so security fixes - # would need to be cherry-picked from releases - (fetchpatch { - name = "CVE-2021-22204.patch"; - url = "https://salsa.debian.org/perl-team/modules/packages/libimage-exiftool-perl/-/raw/0347501fda93cb8366d6451aedcf258b34fb4a2b/debian/patches/CVE-2021-22204.patch"; - sha256 = "1fxw32zcssillnv764wsd05lyswn8bbrc90q5cy9aknx0ncgsrxj"; - }) - ]; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; postInstall = lib.optionalString stdenv.isDarwin '' shortenPerlShebang $out/bin/exiftool