From b3c19ad3ce221fbfd4dfd25173315961a02b9d08 Mon Sep 17 00:00:00 2001
From: jacobi petrucciani <j@cobi.dev>
Date: Fri, 23 Dec 2022 11:46:32 -0500
Subject: [PATCH 01/13] python3Packages.tidyexc: init at 0.10.0

---
 .../python-modules/tidyexc/default.nix        | 25 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/python-modules/tidyexc/default.nix

diff --git a/pkgs/development/python-modules/tidyexc/default.nix b/pkgs/development/python-modules/tidyexc/default.nix
new file mode 100644
index 000000000000..e59b65f4d923
--- /dev/null
+++ b/pkgs/development/python-modules/tidyexc/default.nix
@@ -0,0 +1,25 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+}:
+
+buildPythonPackage rec {
+  pname = "tidyexc";
+  version = "0.10.0";
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1gl1jmihafawg7hvnn4xb20vd2x5qpvca0m1wr2gk0m2jj42yiq6";
+  };
+
+  format = "flit";
+  pythonImportsCheck = [ "tidyexc" ];
+
+  meta = with lib; {
+    description = "Raise rich, helpful exceptions";
+    homepage = "https://github.com/kalekundert/tidyexc";
+    changelog = "https://github.com/kalekundert/tidyexc/blob/v${version}/CHANGELOG.md";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jpetrucciani ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 405b9de1c9db..718d6c882fc0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11185,6 +11185,8 @@ self: super: with self; {
     py = python.override { x11Support=true; };
   };
 
+  tidyexc = callPackage ../development/python-modules/tidyexc { };
+
   tidylib = callPackage ../development/python-modules/pytidylib { };
 
   tifffile = callPackage ../development/python-modules/tifffile { };

From af1c088addbb1a4639cc41d79c379d0d274db34e Mon Sep 17 00:00:00 2001
From: jacobi petrucciani <j@cobi.dev>
Date: Fri, 23 Dec 2022 12:30:51 -0500
Subject: [PATCH 02/13] python3Packages.parametrize-from-file: init at 0.17.0

---
 .../parametrize-from-file/default.nix         | 55 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 57 insertions(+)
 create mode 100644 pkgs/development/python-modules/parametrize-from-file/default.nix

diff --git a/pkgs/development/python-modules/parametrize-from-file/default.nix b/pkgs/development/python-modules/parametrize-from-file/default.nix
new file mode 100644
index 000000000000..cacc75f3eb2c
--- /dev/null
+++ b/pkgs/development/python-modules/parametrize-from-file/default.nix
@@ -0,0 +1,55 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pytestCheckHook
+, coveralls
+, numpy
+, contextlib2
+, decopatch
+, more-itertools
+, nestedtext
+, pyyaml
+, tidyexc
+, toml
+}:
+
+buildPythonPackage rec {
+  pname = "parametrize-from-file";
+  version = "0.17.0";
+
+  src = fetchPypi {
+    inherit version;
+    pname = "parametrize_from_file";
+    sha256 = "1c91j869n2vplvhawxc1sv8km8l53bhlxhhms43fyjsqvy351v5j";
+  };
+
+  format = "flit";
+  pythonImportsCheck = [ "parametrize_from_file" ];
+
+  # patch out coveralls since it doesn't provide us value
+  preBuild = ''
+    sed -i '/coveralls/d' ./pyproject.toml
+  '';
+
+  checkInputs = [
+    numpy
+    pytestCheckHook
+  ];
+  propagatedBuildInputs = [
+    contextlib2
+    decopatch
+    more-itertools
+    nestedtext
+    pyyaml
+    tidyexc
+    toml
+  ];
+
+  meta = with lib; {
+    description = "Read unit test parameters from config files";
+    homepage = "https://github.com/kalekundert/parametrize_from_file";
+    changelog = "https://github.com/kalekundert/parametrize_from_file/blob/v${version}/CHANGELOG.md";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jpetrucciani ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 718d6c882fc0..63c60d0391ab 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6709,6 +6709,8 @@ self: super: with self; {
 
   parameterized = callPackage ../development/python-modules/parameterized { };
 
+  parametrize-from-file = callPackage ../development/python-modules/parametrize-from-file { };
+
   paramiko = callPackage ../development/python-modules/paramiko { };
 
   paramz = callPackage ../development/python-modules/paramz { };

From 7cb68c8fbcd6beaf9b8962cbc372e540be80f749 Mon Sep 17 00:00:00 2001
From: jacobi petrucciani <j@cobi.dev>
Date: Fri, 23 Dec 2022 12:31:07 -0500
Subject: [PATCH 03/13] python3Packages.rkm-codes: init at 0.5

---
 .../python-modules/rkm-codes/default.nix      | 45 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/development/python-modules/rkm-codes/default.nix

diff --git a/pkgs/development/python-modules/rkm-codes/default.nix b/pkgs/development/python-modules/rkm-codes/default.nix
new file mode 100644
index 000000000000..5c3ddf70e91d
--- /dev/null
+++ b/pkgs/development/python-modules/rkm-codes/default.nix
@@ -0,0 +1,45 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, flitBuildHook
+, setuptools
+}:
+
+buildPythonPackage rec {
+  pname = "rkm-codes";
+  version = "0.5";
+
+  src = fetchFromGitHub {
+    owner = "KenKundert";
+    repo = "rkm_codes";
+    rev = "v${version}";
+    sha256 = "sha256-r4F72iHxH7BoPtgYm1RD6BeSZszKRrpeBQccmT4wzuw=";
+  };
+
+  format = "pyproject";
+  nativeBuildInputs = [
+    flitBuildHook
+  ];
+  propagatedBuildInputs = [
+    setuptools
+  ];
+
+  # this has a circular dependency on quantiphy
+  preBuild = ''
+    sed -i '/quantiphy/d' ./setup.py
+    sed -i '/pytest-runner/d' ./setup.py
+  '';
+
+  # this import check will fail as quantiphy is imported by this package
+  # pythonImportsCheck = [ "rkm_codes" ];
+
+  # tests require quantiphy import
+  doCheck = false;
+
+  meta = with lib; {
+    description = "QuantiPhy support for RKM codes";
+    homepage = "https://github.com/kenkundert/rkm_codes/";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ jpetrucciani ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 63c60d0391ab..78018b8fac3e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9863,6 +9863,8 @@ self: super: with self; {
 
   rki-covid-parser = callPackage ../development/python-modules/rki-covid-parser { };
 
+  rkm-codes = callPackage ../development/python-modules/rkm-codes { };
+
   rlax = callPackage ../development/python-modules/rlax { };
 
   rl-coach = callPackage ../development/python-modules/rl-coach { };

From 0ed791f015fb8584a6a78d73df63458cb3c5dbb0 Mon Sep 17 00:00:00 2001
From: jacobi petrucciani <j@cobi.dev>
Date: Fri, 23 Dec 2022 12:31:39 -0500
Subject: [PATCH 04/13] python3Packages.quantiphy-eval: init at 0.5

---
 .../python-modules/quantiphy-eval/default.nix | 39 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/python-modules/quantiphy-eval/default.nix

diff --git a/pkgs/development/python-modules/quantiphy-eval/default.nix b/pkgs/development/python-modules/quantiphy-eval/default.nix
new file mode 100644
index 000000000000..b89d85096eb1
--- /dev/null
+++ b/pkgs/development/python-modules/quantiphy-eval/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, inform
+, sly
+}:
+
+buildPythonPackage rec {
+  pname = "quantiphy-eval";
+  version = "0.5";
+
+  src = fetchFromGitHub {
+    owner = "KenKundert";
+    repo = "quantiphy_eval";
+    rev = "v${version}";
+    sha256 = "sha256-7VHcuINhe17lRNkHUnZkVOEtD6mVWk5gu0NbrLZwprg=";
+  };
+
+  format = "flit";
+  propagatedBuildInputs = [
+    inform
+    sly
+  ];
+
+  # this has a circular dependency on quantiphy
+  preBuild = ''
+    sed -i '/quantiphy>/d' ./pyproject.toml
+  '';
+
+  # tests require quantiphy import
+  doCheck = false;
+
+  meta = with lib; {
+    description = "QuantiPhy support for evals in-line";
+    homepage = "https://github.com/KenKundert/quantiphy_eval/";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jpetrucciani ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 78018b8fac3e..02cfba1f0ef3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9589,6 +9589,8 @@ self: super: with self; {
 
   quantities = callPackage ../development/python-modules/quantities { };
 
+  quantiphy-eval = callPackage ../development/python-modules/quantiphy-eval { };
+
   quantum-gateway = callPackage ../development/python-modules/quantum-gateway { };
 
   querystring_parser = callPackage ../development/python-modules/querystring-parser { };

From bc20ca6f34f58ba428a13a90cedf5c76040fcf3f Mon Sep 17 00:00:00 2001
From: jacobi petrucciani <j@cobi.dev>
Date: Fri, 23 Dec 2022 12:32:00 -0500
Subject: [PATCH 05/13] python3Packages.quantiphy: init at 2.18

---
 .../python-modules/quantiphy/default.nix      | 49 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/development/python-modules/quantiphy/default.nix

diff --git a/pkgs/development/python-modules/quantiphy/default.nix b/pkgs/development/python-modules/quantiphy/default.nix
new file mode 100644
index 000000000000..bcc9b4d78a90
--- /dev/null
+++ b/pkgs/development/python-modules/quantiphy/default.nix
@@ -0,0 +1,49 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, flitBuildHook
+, pytestCheckHook
+, pythonOlder
+, inform
+, parametrize-from-file
+, setuptools
+, voluptuous
+, quantiphy-eval
+, rkm-codes
+}:
+
+buildPythonPackage rec {
+  pname = "quantiphy";
+  version = "2.18";
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "KenKundert";
+    repo = "quantiphy";
+    rev = "v${version}";
+    sha256 = "sha256-KXZQTal5EQDrMNV9QKeuLeYYDaMfAJlEDEagq2XG9/Q=";
+  };
+
+  format = "pyproject";
+  nativeBuildInputs = [
+    flitBuildHook
+  ];
+  checkInputs = [
+    inform
+    parametrize-from-file
+    pytestCheckHook
+    setuptools
+    voluptuous
+  ];
+  propagatedBuildInputs = [
+    quantiphy-eval
+    rkm-codes
+  ];
+
+  meta = with lib; {
+    description = "Module for physical quantities (numbers with units)";
+    homepage = "https://quantiphy.readthedocs.io";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jpetrucciani ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 02cfba1f0ef3..78a2453e8205 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9589,6 +9589,8 @@ self: super: with self; {
 
   quantities = callPackage ../development/python-modules/quantities { };
 
+  quantiphy = callPackage ../development/python-modules/quantiphy { };
+
   quantiphy-eval = callPackage ../development/python-modules/quantiphy-eval { };
 
   quantum-gateway = callPackage ../development/python-modules/quantum-gateway { };

From defb6bb79809c021f9070677e2689efb45a463bf Mon Sep 17 00:00:00 2001
From: jacobi petrucciani <j@cobi.dev>
Date: Fri, 23 Dec 2022 12:32:28 -0500
Subject: [PATCH 06/13] python3Packages.shlib: init at 1.5

---
 .../python-modules/shlib/default.nix          | 39 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/python-modules/shlib/default.nix

diff --git a/pkgs/development/python-modules/shlib/default.nix b/pkgs/development/python-modules/shlib/default.nix
new file mode 100644
index 000000000000..73f963c79e4c
--- /dev/null
+++ b/pkgs/development/python-modules/shlib/default.nix
@@ -0,0 +1,39 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, braceexpand
+, inform
+}:
+
+buildPythonPackage rec {
+  pname = "shlib";
+  version = "1.5";
+
+  src = fetchFromGitHub {
+    owner = "KenKundert";
+    repo = "shlib";
+    rev = "v${version}";
+    sha256 = "sha256-2fwRxa64QXKJuhYwt9Z4BxhTeq1iwbd/IznfxPUjeSM=";
+  };
+
+  pythonImportsCheck = [ "shlib" ];
+  postPatch = ''
+    patchShebangs .
+  '';
+  checkInputs = [
+    pytestCheckHook
+  ];
+  propagatedBuildInputs = [
+    braceexpand
+    inform
+  ];
+
+  meta = with lib; {
+    description = "shell library";
+    homepage = "https://github.com/KenKundert/shlib";
+    changelog = "https://github.com/KenKundert/shlib/releases/tag/v${version}";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ jpetrucciani ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 78a2453e8205..863de73235ac 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10274,6 +10274,8 @@ self: super: with self; {
 
   sh = callPackage ../development/python-modules/sh { };
 
+  shlib = callPackage ../development/python-modules/shlib { };
+
   shellescape = callPackage ../development/python-modules/shellescape { };
 
   shellingham = callPackage ../development/python-modules/shellingham { };

From 5b26020a9f13f7d2013597f8b2a09705adc5337d Mon Sep 17 00:00:00 2001
From: jacobi petrucciani <j@cobi.dev>
Date: Fri, 23 Dec 2022 12:33:06 -0500
Subject: [PATCH 07/13] python3Packages.emborg: init at 1.34

---
 .../python-modules/emborg/default.nix         | 68 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 72 insertions(+)
 create mode 100644 pkgs/development/python-modules/emborg/default.nix

diff --git a/pkgs/development/python-modules/emborg/default.nix b/pkgs/development/python-modules/emborg/default.nix
new file mode 100644
index 000000000000..98b5f6158515
--- /dev/null
+++ b/pkgs/development/python-modules/emborg/default.nix
@@ -0,0 +1,68 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, fetchpatch
+, pytestCheckHook
+, borgbackup
+, appdirs
+, arrow
+, docopt
+, inform
+, nestedtext
+, parametrize-from-file
+, quantiphy
+, requests
+, shlib
+, voluptuous
+}:
+
+buildPythonPackage rec {
+  pname = "emborg";
+  version = "1.34";
+
+  src = fetchFromGitHub {
+    owner = "KenKundert";
+    repo = "emborg";
+    rev = "v${version}";
+    sha256 = "sha256-bnlELPZzTU9KyVsz5Q0aW9xWvVrgwpowQrjkQvX844g=";
+  };
+
+  format = "flit";
+  checkInputs = [
+    nestedtext
+    parametrize-from-file
+    pytestCheckHook
+    shlib
+    voluptuous
+    borgbackup
+  ];
+  propagatedBuildInputs = [
+    appdirs
+    arrow
+    docopt
+    inform
+    quantiphy
+    requests
+  ];
+
+  # this disables testing fuse mounts
+  MISSING_DEPENDENCIES = "fuse";
+  postPatch = ''
+    patchShebangs .
+  '';
+
+  # this patch fixes a whitespace issue in the message that a test is expecting, https://github.com/KenKundert/emborg/pull/67
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/KenKundert/emborg/commit/afac6d1ddcecdb4bddbec87b6c8eed4cfbf4ebf9.diff";
+      sha256 = "3xg2z03FLKH4ckmiBZqE1FDjpgjgdO8OZL1ewrJlQ4o=";
+    })
+  ];
+
+  meta = with lib; {
+    description = "Interactive command line interface to Borg Backup";
+    homepage = "https://github.com/KenKundert/emborg";
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ jpetrucciani ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f6ee2814f487..f97b8bff35ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6823,6 +6823,8 @@ with pkgs;
   embree = callPackage ../development/libraries/embree { };
   embree2 = callPackage ../development/libraries/embree/2.x.nix { };
 
+  emborg = python3Packages.callPackage ../development/python-modules/emborg { };
+
   emem = callPackage ../applications/misc/emem { };
 
   empty = callPackage ../tools/misc/empty { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 863de73235ac..cfd674f84932 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2941,6 +2941,8 @@ self: super: with self; {
 
   embrace = callPackage ../development/python-modules/embrace { };
 
+  emborg = callPackage ../development/python-modules/emborg { };
+
   emcee = callPackage ../development/python-modules/emcee { };
 
   emv = callPackage ../development/python-modules/emv { };

From b29c7906f8a0bd70166a9680a320e6dddc94519d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 29 Dec 2022 16:44:43 +0100
Subject: [PATCH 08/13] python3Packages.emborg: add changelog to meta

- add pythonImportsCheck
---
 .../python-modules/emborg/default.nix         | 30 ++++++++++++-------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/emborg/default.nix b/pkgs/development/python-modules/emborg/default.nix
index 98b5f6158515..d2e69f06c605 100644
--- a/pkgs/development/python-modules/emborg/default.nix
+++ b/pkgs/development/python-modules/emborg/default.nix
@@ -3,6 +3,7 @@
 , fetchFromGitHub
 , fetchpatch
 , pytestCheckHook
+, pythonOlder
 , borgbackup
 , appdirs
 , arrow
@@ -19,23 +20,17 @@
 buildPythonPackage rec {
   pname = "emborg";
   version = "1.34";
+  format = "flit";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "KenKundert";
     repo = "emborg";
     rev = "v${version}";
-    sha256 = "sha256-bnlELPZzTU9KyVsz5Q0aW9xWvVrgwpowQrjkQvX844g=";
+    hash = "sha256-bnlELPZzTU9KyVsz5Q0aW9xWvVrgwpowQrjkQvX844g=";
   };
 
-  format = "flit";
-  checkInputs = [
-    nestedtext
-    parametrize-from-file
-    pytestCheckHook
-    shlib
-    voluptuous
-    borgbackup
-  ];
   propagatedBuildInputs = [
     appdirs
     arrow
@@ -45,8 +40,18 @@ buildPythonPackage rec {
     requests
   ];
 
+  checkInputs = [
+    nestedtext
+    parametrize-from-file
+    pytestCheckHook
+    shlib
+    voluptuous
+    borgbackup
+  ];
+
   # this disables testing fuse mounts
   MISSING_DEPENDENCIES = "fuse";
+
   postPatch = ''
     patchShebangs .
   '';
@@ -59,9 +64,14 @@ buildPythonPackage rec {
     })
   ];
 
+  pythonImportsCheck = [
+    "emborg"
+  ];
+
   meta = with lib; {
     description = "Interactive command line interface to Borg Backup";
     homepage = "https://github.com/KenKundert/emborg";
+    changelog = "https://github.com/KenKundert/emborg/releases/tag/v${version}";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ jpetrucciani ];
   };

From 2118355ed050f2323c83d378612cde33cc080dd8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 29 Dec 2022 16:49:28 +0100
Subject: [PATCH 09/13] python310Packages.quantiphy-eval: add changelog to meta

- add pythonImportsCheck
---
 .../python-modules/quantiphy-eval/default.nix        | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/quantiphy-eval/default.nix b/pkgs/development/python-modules/quantiphy-eval/default.nix
index b89d85096eb1..58b504b3d74b 100644
--- a/pkgs/development/python-modules/quantiphy-eval/default.nix
+++ b/pkgs/development/python-modules/quantiphy-eval/default.nix
@@ -2,21 +2,24 @@
 , buildPythonPackage
 , fetchFromGitHub
 , inform
+, pythonOlder
 , sly
 }:
 
 buildPythonPackage rec {
   pname = "quantiphy-eval";
   version = "0.5";
+  format = "flit";
+
+  disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "KenKundert";
     repo = "quantiphy_eval";
     rev = "v${version}";
-    sha256 = "sha256-7VHcuINhe17lRNkHUnZkVOEtD6mVWk5gu0NbrLZwprg=";
+    hash = "sha256-7VHcuINhe17lRNkHUnZkVOEtD6mVWk5gu0NbrLZwprg=";
   };
 
-  format = "flit";
   propagatedBuildInputs = [
     inform
     sly
@@ -30,9 +33,14 @@ buildPythonPackage rec {
   # tests require quantiphy import
   doCheck = false;
 
+  pythonImportsCheck = [
+    "quantiphy_eval"
+  ];
+
   meta = with lib; {
     description = "QuantiPhy support for evals in-line";
     homepage = "https://github.com/KenKundert/quantiphy_eval/";
+    changelog = "https://github.com/KenKundert/quantiphy_eval/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ jpetrucciani ];
   };

From b0d10bb3a2b61ded17bad25bb1102f6b8ac00922 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 29 Dec 2022 16:52:45 +0100
Subject: [PATCH 10/13] python310Packages.quantiphy: add changelog to meta

- add pythonImportsCheck
---
 .../python-modules/quantiphy/default.nix       | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/quantiphy/default.nix b/pkgs/development/python-modules/quantiphy/default.nix
index bcc9b4d78a90..12c54353eecf 100644
--- a/pkgs/development/python-modules/quantiphy/default.nix
+++ b/pkgs/development/python-modules/quantiphy/default.nix
@@ -15,19 +15,26 @@
 buildPythonPackage rec {
   pname = "quantiphy";
   version = "2.18";
+  format = "pyproject";
+
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "KenKundert";
     repo = "quantiphy";
     rev = "v${version}";
-    sha256 = "sha256-KXZQTal5EQDrMNV9QKeuLeYYDaMfAJlEDEagq2XG9/Q=";
+    hash = "sha256-KXZQTal5EQDrMNV9QKeuLeYYDaMfAJlEDEagq2XG9/Q=";
   };
 
-  format = "pyproject";
   nativeBuildInputs = [
     flitBuildHook
   ];
+
+  propagatedBuildInputs = [
+    quantiphy-eval
+    rkm-codes
+  ];
+
   checkInputs = [
     inform
     parametrize-from-file
@@ -35,14 +42,15 @@ buildPythonPackage rec {
     setuptools
     voluptuous
   ];
-  propagatedBuildInputs = [
-    quantiphy-eval
-    rkm-codes
+
+  pythonImportsCheck = [
+    "quantiphy"
   ];
 
   meta = with lib; {
     description = "Module for physical quantities (numbers with units)";
     homepage = "https://quantiphy.readthedocs.io";
+    changelog = "https://github.com/KenKundert/quantiphy/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ jpetrucciani ];
   };

From 2ce4af2f1cd721bfd8cfbb2c89b2df560dd6bf65 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 29 Dec 2022 16:54:53 +0100
Subject: [PATCH 11/13] python310Packages.tidyexc:  disable on unsupported
 Python releases

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

diff --git a/pkgs/development/python-modules/tidyexc/default.nix b/pkgs/development/python-modules/tidyexc/default.nix
index e59b65f4d923..b4f7ed0ef582 100644
--- a/pkgs/development/python-modules/tidyexc/default.nix
+++ b/pkgs/development/python-modules/tidyexc/default.nix
@@ -1,19 +1,24 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "tidyexc";
   version = "0.10.0";
+  format = "flit";
+
+  disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "1gl1jmihafawg7hvnn4xb20vd2x5qpvca0m1wr2gk0m2jj42yiq6";
   };
 
-  format = "flit";
-  pythonImportsCheck = [ "tidyexc" ];
+  pythonImportsCheck = [
+    "tidyexc"
+  ];
 
   meta = with lib; {
     description = "Raise rich, helpful exceptions";

From 0b2353bad6aeafeffb3a050cfa18b359ef9855f6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 29 Dec 2022 17:00:35 +0100
Subject: [PATCH 12/13] python310Packages.quantiphy-eval: disable
 pythonImportsCheck

---
 pkgs/development/python-modules/quantiphy-eval/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/quantiphy-eval/default.nix b/pkgs/development/python-modules/quantiphy-eval/default.nix
index 58b504b3d74b..e86f9ebb5e95 100644
--- a/pkgs/development/python-modules/quantiphy-eval/default.nix
+++ b/pkgs/development/python-modules/quantiphy-eval/default.nix
@@ -33,9 +33,10 @@ buildPythonPackage rec {
   # tests require quantiphy import
   doCheck = false;
 
-  pythonImportsCheck = [
-    "quantiphy_eval"
-  ];
+  # Also affeted by the circular dependency on quantiphy
+  # pythonImportsCheck = [
+  #   "quantiphy_eval"
+  # ];
 
   meta = with lib; {
     description = "QuantiPhy support for evals in-line";

From 1b0bcfbef131a4a589d546dc28a5c7e0ce70b23e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 29 Dec 2022 17:01:31 +0100
Subject: [PATCH 13/13] python310Packages.quantiphy-eval: fix typo

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

diff --git a/pkgs/development/python-modules/quantiphy-eval/default.nix b/pkgs/development/python-modules/quantiphy-eval/default.nix
index e86f9ebb5e95..68eba2e94627 100644
--- a/pkgs/development/python-modules/quantiphy-eval/default.nix
+++ b/pkgs/development/python-modules/quantiphy-eval/default.nix
@@ -33,7 +33,7 @@ buildPythonPackage rec {
   # tests require quantiphy import
   doCheck = false;
 
-  # Also affeted by the circular dependency on quantiphy
+  # Also affected by the circular dependency on quantiphy
   # pythonImportsCheck = [
   #   "quantiphy_eval"
   # ];