From 27d065dbf294e56c0284a6f8333638515c7a178b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 30 Mar 2022 02:25:08 +0200
Subject: [PATCH 1/2] python39Packages.kiwisolver: 1.4.0 -> 1.4.2

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

diff --git a/pkgs/development/python-modules/kiwisolver/default.nix b/pkgs/development/python-modules/kiwisolver/default.nix
index 8ed90dd3e75c..bf2dbb9e395f 100644
--- a/pkgs/development/python-modules/kiwisolver/default.nix
+++ b/pkgs/development/python-modules/kiwisolver/default.nix
@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "kiwisolver";
-  version = "1.4.0";
+  version = "1.4.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-dQiwHiEReKhdIfH4cCmEa3eyQEpMaMvRR0jU1BQvo7g=";
+    sha256 = "sha256-f2BtkbiogWvkdlE6d/0wq+ZiJwOb1vi0BsNIywJH3Mk=";
   };
 
   NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1";

From 701497206bd894670a258cb6cf412bf7d32c1b07 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 30 Mar 2022 09:55:32 +0200
Subject: [PATCH 2/2] python3Packages.kiwisolver: disable on older Python
 releases

---
 .../python-modules/kiwisolver/default.nix       | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/kiwisolver/default.nix b/pkgs/development/python-modules/kiwisolver/default.nix
index bf2dbb9e395f..b968fa3a50aa 100644
--- a/pkgs/development/python-modules/kiwisolver/default.nix
+++ b/pkgs/development/python-modules/kiwisolver/default.nix
@@ -5,18 +5,24 @@
 , libcxx
 , cppy
 , setuptools-scm
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "kiwisolver";
   version = "1.4.2";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-f2BtkbiogWvkdlE6d/0wq+ZiJwOb1vi0BsNIywJH3Mk=";
+    hash = "sha256-f2BtkbiogWvkdlE6d/0wq+ZiJwOb1vi0BsNIywJH3Mk=";
   };
 
-  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"
+  ];
 
   nativeBuildInputs = [
     setuptools-scm
@@ -26,11 +32,14 @@ buildPythonPackage rec {
     cppy
   ];
 
-  pythonImportsCheck = [ "kiwisolver" ];
+  pythonImportsCheck = [
+    "kiwisolver"
+  ];
 
   meta = with lib; {
-    description = "A fast implementation of the Cassowary constraint solver";
+    description = "Implementation of the Cassowary constraint solver";
     homepage = "https://github.com/nucleic/kiwi";
     license = licenses.bsd3;
+    maintainers = with maintainers; [ ];
   };
 }