diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix index 0d54656c1586..31bf90f7f0ae 100644 --- a/pkgs/development/python-modules/mat2/default.nix +++ b/pkgs/development/python-modules/mat2/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "mat2"; - version = "0.12.2"; + version = "0.12.3"; disabled = pythonOlder "3.5"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "jvoisin"; repo = "mat2"; rev = version; - sha256 = "sha256-KaHdBmTeBlCRaVkG3WsfDtFo45s/X69x7VGDYY7W5O8="; + hash = "sha256-TW+FwlZ+J1tanPL5WuwXtZJmtYB9LaimeIaPlN/jzqo="; }; patches = [ @@ -40,8 +40,6 @@ buildPythonPackage rec { bwrap = "${bubblewrap}/bin/bwrap"; exiftool = "${exiftool}/bin/exiftool"; ffmpeg = "${ffmpeg}/bin/ffmpeg"; - # remove once faf0f8a8a4134edbeec0a73de7f938453444186d is in master - mimetypes = "${mime-types}/etc/mime.types"; } // lib.optionalAttrs dolphinIntegration { kdialog = "${plasma5Packages.kdialog}/bin/kdialog"; })) diff --git a/pkgs/development/python-modules/mat2/paths.patch b/pkgs/development/python-modules/mat2/paths.patch index 7e828d3f5339..50b0c9aaa789 100644 --- a/pkgs/development/python-modules/mat2/paths.patch +++ b/pkgs/development/python-modules/mat2/paths.patch @@ -1,5 +1,5 @@ diff --git a/dolphin/mat2.desktop b/dolphin/mat2.desktop -index d365bc5..56313e2 100644 +index 41c8de4..11df258 100644 --- a/dolphin/mat2.desktop +++ b/dolphin/mat2.desktop @@ -8,6 +8,6 @@ Type=Service @@ -7,11 +7,11 @@ index d365bc5..56313e2 100644 Name[de]=Metadaten löschen Name[es]=Limpiar metadatos -Icon=/usr/share/icons/hicolor/scalable/apps/mat2.svg --Exec=kdialog --yesno "$( mat2 -s %U )" --title "Clean Metadata?" && mat2 %U --Exec[de]=kdialog --yesno "$( mat2 -s %U )" --title "Metadaten löschen?" && mat2 %U +-Exec=kdialog --yesno "$( mat2 -s %F )" --title "Clean Metadata?" && mat2 %U +-Exec[de]=kdialog --yesno "$( mat2 -s %F )" --title "Metadaten löschen?" && mat2 %U +Icon=@mat2svg@ -+Exec=@kdialog@ --yesno "$( mat2 -s %U )" --title "Clean Metadata?" && mat2 %U -+Exec[de]=@kdialog@ --yesno "$( mat2 -s %U )" --title "Metadaten löschen?" && mat2 %U ++Exec=@kdialog@ --yesno "$( @mat2@ -s %F )" --title "Clean Metadata?" && @mat2@ %U ++Exec[de]=@kdialog@ --yesno "$( @mat2@ -s %F )" --title "Metadaten löschen?" && @mat2@ %U diff --git a/libmat2/bubblewrap.py b/libmat2/bubblewrap.py index 970d5dd..5d3c0b7 100644 --- a/libmat2/bubblewrap.py @@ -76,20 +76,8 @@ index eb65b2a..51a0fa1 100644 - - raise RuntimeError("Unable to find exiftool") + return '@exiftool@' -diff --git a/libmat2/parser_factory.py b/libmat2/parser_factory.py -index 9965432..bd45179 100644 ---- a/libmat2/parser_factory.py -+++ b/libmat2/parser_factory.py -@@ -8,6 +8,7 @@ from . import abstract, UNSUPPORTED_EXTENSIONS - - T = TypeVar('T', bound='abstract.AbstractParser') - -+mimetypes.init(['@mimetypes@']) - mimetypes.add_type('application/epub+zip', '.epub') - mimetypes.add_type('application/x-dtbncx+xml', '.ncx') # EPUB Navigation Control XML File - diff --git a/libmat2/video.py b/libmat2/video.py -index b4a3232..3dd7ee5 100644 +index ae9e463..2acc65c 100644 --- a/libmat2/video.py +++ b/libmat2/video.py @@ -1,6 +1,4 @@