From 1eaf8eb13141080603ddaaa476bf57f6db6d6385 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sat, 8 Oct 2022 14:05:31 +0200 Subject: [PATCH 1/3] exiftool: 12.39 -> 12.49 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index b16f8844856e..ce87f6f8698b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12503,11 +12503,11 @@ let ImageExifTool = buildPerlPackage rec { pname = "Image-ExifTool"; - version = "12.39"; + version = "12.49"; src = fetchurl { url = "https://exiftool.org/Image-ExifTool-${version}.tar.gz"; - hash = "sha256-QDq1KTpEcl8EWj9a/bxF0TwghUulH30O5yDV0wsxy6I="; + hash = "sha256-l21p2ak+pe9GSWOatsGQ9YvyZfAFfKV3xB38rzexcVs="; }; nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; From fae44cebb0a8ad4c03dfdf2bed975e46358a8881 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sat, 8 Oct 2022 14:05:44 +0200 Subject: [PATCH 2/3] exiftool: add anthonyroussel to maintainers --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ce87f6f8698b..6e92eecf8375 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -12531,7 +12531,7 @@ let homepage = "https://exiftool.org/"; license = with lib.licenses; [ gpl1Plus /* or */ artistic2 ]; - maintainers = [ maintainers.kiloreux ]; + maintainers = with maintainers; [ kiloreux anthonyroussel ]; mainProgram = "exiftool"; }; }; From cd178c6174a3853144f4469acd878acc73419655 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Sun, 9 Oct 2022 21:54:48 +0200 Subject: [PATCH 3/3] mat2: fix tests with exiftool v12.47 --- pkgs/development/python-modules/mat2/default.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix index 59a1dddc22bf..6e2b1a02402d 100644 --- a/pkgs/development/python-modules/mat2/default.nix +++ b/pkgs/development/python-modules/mat2/default.nix @@ -4,6 +4,7 @@ , unittestCheckHook , pythonOlder , fetchFromGitLab +, fetchpatch , substituteAll , bubblewrap , exiftool @@ -53,6 +54,11 @@ buildPythonPackage rec { src = ./fix_poppler.patch; poppler_path = "${poppler_gi}/lib/girepository-1.0"; }) + # https://0xacab.org/jvoisin/mat2/-/issues/178 + (fetchpatch { + url = "https://0xacab.org/jvoisin/mat2/-/commit/618e0a8e3984fd534b95ef3dbdcb8a76502c90b5.patch"; + hash = "sha256-l9UFim3hGj+d2uKITiDG1OnqGeo2McBIiRSmK0Vidg8="; + }) ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ (substituteAll { src = ./bubblewrap-path.patch;