dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #195084 from anthonyroussel/exiftool_12_47

Browse Source
This commit is contained in:
Sandro 2022-10-27 23:47:13 +02:00 committed by GitHub
commit 816fd1fa82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/python-modules/mat2/default.nix
View File

@ -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;

6
pkgs/top-level/perl-packages.nix
View File

@ -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;
@ -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";
};
};