From e6daff8e0797ee0a44c6a55aeb2d3f57d428fd15 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 May 2022 03:14:38 +0000
Subject: [PATCH 1/4] python310Packages.py3exiv2: 0.9.3 -> 0.11.0

---
 pkgs/development/python-modules/py3exiv2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/py3exiv2/default.nix b/pkgs/development/python-modules/py3exiv2/default.nix
index ef056d296b2..e5e21e77d74 100644
--- a/pkgs/development/python-modules/py3exiv2/default.nix
+++ b/pkgs/development/python-modules/py3exiv2/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonPackage rec {
   pname = "py3exiv2";
-  version = "0.9.3";
+  version = "0.11.0";
   disabled = !(isPy3k);
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "838836e58ca22557d83d1f0ef918bcce899b4c2666340b924b940dcdebf1d18c";
+    sha256 = "sha256-ZgDaa4lxmdTaZhkblgRfPMxfVwENp2s6xdKSuD/MqEQ=";
   };
 
   buildInputs = [ exiv2 boost ];

From 80ca27442bbe9378efd75f537fafa38d38607d2c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 7 May 2022 16:10:26 +0200
Subject: [PATCH 2/4] python310Packages.py3exiv2: disable on older Python
 releases

- add pythonImportsCheck
---
 .../python-modules/py3exiv2/default.nix       | 33 +++++++++++++++----
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/py3exiv2/default.nix b/pkgs/development/python-modules/py3exiv2/default.nix
index e5e21e77d74..c9949ac9106 100644
--- a/pkgs/development/python-modules/py3exiv2/default.nix
+++ b/pkgs/development/python-modules/py3exiv2/default.nix
@@ -1,24 +1,43 @@
-{ lib, buildPythonPackage, isPy3k, fetchPypi, stdenv, exiv2, boost, libcxx }:
+{ lib
+, stdenv
+, buildPythonPackage
+, pythonOlder
+, fetchPypi
+, exiv2
+, boost
+, libcxx
+}:
 
 buildPythonPackage rec {
   pname = "py3exiv2";
   version = "0.11.0";
-  disabled = !(isPy3k);
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-ZgDaa4lxmdTaZhkblgRfPMxfVwENp2s6xdKSuD/MqEQ=";
+    hash = "sha256-ZgDaa4lxmdTaZhkblgRfPMxfVwENp2s6xdKSuD/MqEQ=";
   };
 
-  buildInputs = [ exiv2 boost ];
+  buildInputs = [
+    boost
+    exiv2
+  ];
 
   # work around python distutils compiling C++ with $CC (see issue #26709)
-  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1";
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin [ 
+    "-I${lib.getDev libcxx}/include/c++/v1"
+  ];
+
+  pythonImportsCheck = [
+    "py3exiv2"
+  ];
 
   meta = with lib; {
-    homepage = "https://launchpad.net/py3exiv2";
     description = "A Python3 binding to the library exiv2";
-    license = licenses.gpl3;
+    homepage = "https://launchpad.net/py3exiv2";
+    license = licenses.gpl3Plus;
     maintainers = with maintainers; [ vinymeuh ];
     platforms = with platforms; linux ++ darwin;
   };

From 1f4de2c0c901aeb9e32f42995d729e7ff6b35658 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 7 May 2022 16:13:21 +0200
Subject: [PATCH 3/4] python310Packages.py3exiv2: remove whitespace

---
 pkgs/development/python-modules/py3exiv2/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/py3exiv2/default.nix b/pkgs/development/python-modules/py3exiv2/default.nix
index c9949ac9106..7995cf8bae2 100644
--- a/pkgs/development/python-modules/py3exiv2/default.nix
+++ b/pkgs/development/python-modules/py3exiv2/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   ];
 
   # work around python distutils compiling C++ with $CC (see issue #26709)
-  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin [ 
+  NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin [
     "-I${lib.getDev libcxx}/include/c++/v1"
   ];
 

From 6b6ac53ca52be99ee7e430f10c711fe3c599e3df Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 8 May 2022 15:46:31 +0200
Subject: [PATCH 4/4] python310Packages.py3exiv2: disable tests

---
 .../python-modules/py3exiv2/default.nix           | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/py3exiv2/default.nix b/pkgs/development/python-modules/py3exiv2/default.nix
index 7995cf8bae2..60a8ee7f17f 100644
--- a/pkgs/development/python-modules/py3exiv2/default.nix
+++ b/pkgs/development/python-modules/py3exiv2/default.nix
@@ -1,11 +1,11 @@
 { lib
 , stdenv
+, boost
 , buildPythonPackage
-, pythonOlder
-, fetchPypi
 , exiv2
-, boost
+, fetchPypi
 , libcxx
+, pythonOlder
 }:
 
 buildPythonPackage rec {
@@ -25,17 +25,20 @@ buildPythonPackage rec {
     exiv2
   ];
 
-  # work around python distutils compiling C++ with $CC (see issue #26709)
+  # Work around Python distutils compiling C++ with $CC (see issue #26709)
   NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin [
     "-I${lib.getDev libcxx}/include/c++/v1"
   ];
 
   pythonImportsCheck = [
-    "py3exiv2"
+    "pyexiv2"
   ];
 
+  # Tests are not shipped
+  doCheck = false;
+
   meta = with lib; {
-    description = "A Python3 binding to the library exiv2";
+    description = "Python binding to the library exiv2";
     homepage = "https://launchpad.net/py3exiv2";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ vinymeuh ];