From de5c1ae42241e0f42a45df64fdc6aeff4b72d8ea Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Fri, 2 Aug 2024 22:07:02 +0200
Subject: [PATCH 01/32] python312Packages.nutils-poly: init at 1.0.1

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

diff --git a/pkgs/development/python-modules/nutils-poly/default.nix b/pkgs/development/python-modules/nutils-poly/default.nix
new file mode 100644
index 000000000000..3acda2fe55f1
--- /dev/null
+++ b/pkgs/development/python-modules/nutils-poly/default.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchFromGitHub,
+  rustPlatform,
+  libiconv,
+  numpy,
+  unittestCheckHook,
+  pythonOlder,
+}:
+
+buildPythonPackage rec {
+  pname = "nutils-poly";
+  version = "1.0.1";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "nutils";
+    repo = "poly-py";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-dxFv4Az3uz6Du5dk5KZJ+unVbt3aZjxXliAQZhmBWDM=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoTarball {
+    name = "${pname}-${version}";
+    inherit src;
+    hash = "sha256-+fnKvlSwM197rsyusFH7rs1W6livxel45UGbi1sB05k=";
+  };
+
+  nativeBuildInputs = [ rustPlatform.cargoSetupHook ];
+
+  buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
+
+  build-system = [ rustPlatform.maturinBuildHook ];
+
+  dependencies = [ numpy ];
+
+  nativeCheckInputs = [ unittestCheckHook ];
+
+  pythonImportsCheck = [ "nutils_poly" ];
+
+  meta = {
+    description = "Low-level functions for evaluating and manipulating polynomials";
+    homepage = "https://github.com/nutils/poly-py";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ tomasajt ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 251571df44b8..8fd075e125e3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9222,6 +9222,8 @@ self: super: with self; {
 
   nutils = callPackage ../development/python-modules/nutils { };
 
+  nutils-poly = callPackage ../development/python-modules/nutils-poly { };
+
   nvchecker = callPackage ../development/python-modules/nvchecker { };
 
   nvdlib = callPackage ../development/python-modules/nvdlib { };

From d43931f377413a5369a323f7441d941735b0b5c4 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Fri, 2 Aug 2024 22:14:04 +0200
Subject: [PATCH 02/32] python312Packages.nutils: unbreak by adding missing
 deps

---
 .../python-modules/nutils/default.nix         | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/nutils/default.nix b/pkgs/development/python-modules/nutils/default.nix
index a4ca753766b7..4495a40118be 100644
--- a/pkgs/development/python-modules/nutils/default.nix
+++ b/pkgs/development/python-modules/nutils/default.nix
@@ -2,11 +2,14 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  numpy,
-  treelog,
-  stringly,
   flit-core,
+  appdirs,
   bottombar,
+  numpy,
+  nutils-poly,
+  psutil,
+  stringly,
+  treelog,
   pytestCheckHook,
   pythonOlder,
 }:
@@ -14,9 +17,9 @@
 buildPythonPackage rec {
   pname = "nutils";
   version = "8.7";
-  format = "pyproject";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "evalf";
@@ -25,15 +28,20 @@ buildPythonPackage rec {
     hash = "sha256-wxouS0FXrdIhm6nTVBuzkwHceJnZ7f7k8nMFxFsZchE=";
   };
 
-  nativeBuildInputs = [ flit-core ];
+  build-system = [ flit-core ];
 
-  propagatedBuildInputs = [
-    numpy
-    treelog
-    stringly
+  dependencies = [
+    appdirs
     bottombar
+    numpy
+    nutils-poly
+    psutil
+    stringly
+    treelog
   ];
 
+  pythonRelaxDeps = [ "psutil" ];
+
   nativeCheckInputs = [ pytestCheckHook ];
 
   pythonImportsCheck = [ "nutils" ];

From 6e9fa3be51421fc5ff77172ce70e2215bddde317 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 7 Aug 2024 02:38:09 +0000
Subject: [PATCH 03/32] python312Packages.typecode: 30.0.1 -> 30.0.2

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

diff --git a/pkgs/development/python-modules/typecode/default.nix b/pkgs/development/python-modules/typecode/default.nix
index 2baa87f666fa..659f35a2e52e 100644
--- a/pkgs/development/python-modules/typecode/default.nix
+++ b/pkgs/development/python-modules/typecode/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "typecode";
-  version = "30.0.1";
+  version = "30.0.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Glc5QiTVr//euymeNTxGN+FVaOEa6cUxHGyGo9bQrJc=";
+    hash = "sha256-F2idIK8K5hFueX7yxd5l8M6AkSjPDmhHmzS9a6S8OJg=";
   };
 
   dontConfigure = true;

From e25534387aecd720abebd6436e99864e180827f0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 7 Aug 2024 11:35:04 +0000
Subject: [PATCH 04/32] collector: 1.0.1 -> 0-unstable-2024-08-02

---
 pkgs/by-name/co/collector/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/collector/package.nix b/pkgs/by-name/co/collector/package.nix
index 894fa663a554..61f6f2e07a8b 100644
--- a/pkgs/by-name/co/collector/package.nix
+++ b/pkgs/by-name/co/collector/package.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "collector";
-  version = "1.0.1";
+  version = "0-unstable-2024-08-02";
 
   src = fetchFromGitHub {
     owner = "mijorus";
     repo = "collector";
-    rev = "d98a11c65c7de054cb894aeb4b5e963aeb83c0d8";
-    hash = "sha256-un+PvLAHfosX9jWExepWDbDKev7D9TAu+XfOFm7xOyA=";
+    rev = "7c83ef15ec6189005e63a036f00699adf1cb7132";
+    hash = "sha256-WTNisQuwtyjZ73cVPhuCQkf7FkpAvNx3BrxjpzKc1/s=";
   };
 
   nativeBuildInputs = [

From f1f0fd93159412815850cc797aca5919443df3f1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 7 Aug 2024 02:52:07 +0000
Subject: [PATCH 05/32] python312Packages.pyathena: 3.8.3 -> 3.9.0

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

diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix
index adc1a2093608..da2574f1a70c 100644
--- a/pkgs/development/python-modules/pyathena/default.nix
+++ b/pkgs/development/python-modules/pyathena/default.nix
@@ -9,6 +9,7 @@
   hatchling,
   pandas,
   pyarrow,
+  python-dateutil,
   pythonOlder,
   sqlalchemy,
   tenacity,
@@ -16,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "pyathena";
-  version = "3.8.3";
+  version = "3.9.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-mcYIYOgww4UM0CAcdtOD12pp53clPdDqN85bLRHGDag=";
+    hash = "sha256-SxHUnfAyVcVW4R9j0ONGzCXqGWdaeseP/QU3vNhMtI8=";
   };
 
   nativeBuildInputs = [ hatchling ];
@@ -33,6 +34,7 @@ buildPythonPackage rec {
     botocore
     fsspec
     tenacity
+    python-dateutil
   ];
 
   passthru.optional-dependencies = {

From b7d6e0ee25f6efa18b53448e493944066b1b13b0 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Wed, 7 Aug 2024 21:58:07 +0900
Subject: [PATCH 06/32] python312Packages.pyathena: modernize attribute names

---
 pkgs/development/python-modules/pyathena/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyathena/default.nix b/pkgs/development/python-modules/pyathena/default.nix
index da2574f1a70c..0245c7b47ce8 100644
--- a/pkgs/development/python-modules/pyathena/default.nix
+++ b/pkgs/development/python-modules/pyathena/default.nix
@@ -27,9 +27,9 @@ buildPythonPackage rec {
     hash = "sha256-SxHUnfAyVcVW4R9j0ONGzCXqGWdaeseP/QU3vNhMtI8=";
   };
 
-  nativeBuildInputs = [ hatchling ];
+  build-system = [ hatchling ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     boto3
     botocore
     fsspec
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     python-dateutil
   ];
 
-  passthru.optional-dependencies = {
+  optional-dependencies = {
     pandas = [ pandas ];
     sqlalchemy = [ sqlalchemy ];
     arrow = [ pyarrow ];

From 9cf203941b4fa7cab0d4855cb8636530e86876af Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Wed, 7 Aug 2024 22:04:51 +0900
Subject: [PATCH 07/32] python312Packages.typecode: switch to pypa builder

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

diff --git a/pkgs/development/python-modules/typecode/default.nix b/pkgs/development/python-modules/typecode/default.nix
index 659f35a2e52e..a5c98eddcb24 100644
--- a/pkgs/development/python-modules/typecode/default.nix
+++ b/pkgs/development/python-modules/typecode/default.nix
@@ -2,6 +2,7 @@
   lib,
   fetchPypi,
   buildPythonPackage,
+  setuptools,
   setuptools-scm,
   attrs,
   pdfminer-six,
@@ -17,7 +18,7 @@
 buildPythonPackage rec {
   pname = "typecode";
   version = "30.0.2";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -28,9 +29,12 @@ buildPythonPackage rec {
 
   dontConfigure = true;
 
-  nativeBuildInputs = [ setuptools-scm ];
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     attrs
     pdfminer-six
     commoncode

From d8f4d8c71ca6d217a6ce192d86407dd63f462834 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 7 Aug 2024 13:43:19 +0000
Subject: [PATCH 08/32] thunderbird-unwrapped: 128.0.1esr -> 128.1.0esr

---
 .../networking/mailreaders/thunderbird/packages.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
index ecfc00f958b2..ec18ec2bfb3e 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -60,8 +60,8 @@ in rec {
   };
 
   thunderbird-128 = common {
-    version = "128.0.1esr";
-    sha512 = "db7507fcfd5bc2dd4ad52eaeb87c575d87cb438765861c468ab17678ca6ab32b28b60d0431ec7f558ea0db90fa59e35a8a4aeba046ebd0b00cfb6d9e8019318e";
+    version = "128.1.0esr";
+    sha512 = "cda64afee45ae20a627116f9475cc4421262db40a7efa09eeafcb6e96f8fad97e8c96e2ecf04466ac4bce99fcebe0c3ce9953fa3fc4f5a92ab6f60e122f58c9a";
 
     updateScript = callPackage ./update.nix {
       attrPath = "thunderbirdPackages.thunderbird-128";

From b8bf1cc42f9de51bf910464f45304d4837769eb7 Mon Sep 17 00:00:00 2001
From: natsukium <tomoya.otabi@gmail.com>
Date: Thu, 8 Aug 2024 09:59:01 +0900
Subject: [PATCH 09/32] python312Packages.typecode: update meta.homepage

---
 pkgs/development/python-modules/typecode/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/typecode/default.nix b/pkgs/development/python-modules/typecode/default.nix
index a5c98eddcb24..751f5b715a04 100644
--- a/pkgs/development/python-modules/typecode/default.nix
+++ b/pkgs/development/python-modules/typecode/default.nix
@@ -52,7 +52,7 @@ buildPythonPackage rec {
     "TestFileTypesDataDriven"
 
     # Many of the failures below are reported in:
-    # https://github.com/nexB/typecode/issues/36
+    # https://github.com/aboutcode-org/typecode/issues/36
 
     # AssertionError: assert 'application/x-bytecode.python'...
     "test_compiled_python_1"
@@ -67,8 +67,8 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Comprehensive filetype and mimetype detection using libmagic and Pygments";
-    homepage = "https://github.com/nexB/typecode";
-    changelog = "https://github.com/nexB/typecode/releases/tag/v${version}";
+    homepage = "https://github.com/aboutcode-org/typecode";
+    changelog = "https://github.com/aboutcode-org/typecode/releases/tag/v${version}";
     license = licenses.asl20;
     maintainers = [ ];
   };

From 6ed45ba2b4705d9dd9fc4c5b3da0cdcbd99a402f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 9 Aug 2024 00:53:21 +0000
Subject: [PATCH 10/32] dex: 0.9.0 -> 0.10.1

---
 pkgs/tools/X11/dex/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/X11/dex/default.nix b/pkgs/tools/X11/dex/default.nix
index 306afdd81cd8..c602d2c6a248 100644
--- a/pkgs/tools/X11/dex/default.nix
+++ b/pkgs/tools/X11/dex/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "dex";
-  version = "0.9.0";
+  version = "0.10.1";
 
   src = fetchFromGitHub {
     owner = "jceb";
     repo = pname;
     rev = "v${version}";
-    sha256 = "03aapcywnz4kl548cygpi25m8adwbmqlmwgxa66v4156ax9dqs86";
+    sha256 = "sha256-1fgSz4f6W+Dr3mo4vQY8buD2dNC8RBMGrwCTOIzH7rQ=";
   };
 
   strictDeps = true;

From 981d652a4d32a709698c92dfbda848af6ed7cb1f Mon Sep 17 00:00:00 2001
From: techknowlogick <techknowlogick@gitea.com>
Date: Thu, 8 Aug 2024 22:29:46 -0400
Subject: [PATCH 11/32] firecracker: 1.7.0 -> 1.8.0

---
 .../virtualization/firecracker/default.nix             | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix
index fca5227177d4..a0fa2f76a420 100644
--- a/pkgs/applications/virtualization/firecracker/default.nix
+++ b/pkgs/applications/virtualization/firecracker/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, lib, stdenv }:
 
 let
-  version = "1.7.0";
+  version = "1.8.0";
   # nixpkgs-update: no auto update
 
   suffix = {
@@ -11,9 +11,9 @@ let
 
   baseurl = "https://github.com/firecracker-microvm/firecracker/releases/download";
 
-  dlbin = sha256: fetchurl {
+  dlbin = hash: fetchurl {
     url = "${baseurl}/v${version}/firecracker-v${version}-${suffix}.tgz";
-    sha256 = sha256."${stdenv.hostPlatform.system}"or (throw "unsupported system ${stdenv.hostPlatform.system}");
+    hash = hash."${stdenv.hostPlatform.system}"or (throw "unsupported system ${stdenv.hostPlatform.system}");
   };
 
 in
@@ -23,8 +23,8 @@ stdenv.mkDerivation {
 
   sourceRoot = ".";
   src = dlbin {
-    x86_64-linux = "sha256-Vb0+bVmf3RCONuUvmu4jGfBsGKkPL6SbZOk/3wb1/1M=";
-    aarch64-linux = "sha256-PLoQA4a6qulxSns/ZRSgn6EtHr46/hstNhP1pAHt9VA=";
+    x86_64-linux = "sha256-vImb2u+NCqew+vv0miv2R+AphVj0+u5Elw2HocbRri0=";
+    aarch64-linux = "sha256-ZLSc61MWfXYWv0/Sxz3vaWoyAlnqbgfPFEfJCRxfknE=";
   };
 
   dontConfigure = true;

From d7bbd37ebe070281b880fb48c6bcbe0688062889 Mon Sep 17 00:00:00 2001
From: techknowlogick <techknowlogick@gitea.com>
Date: Thu, 8 Aug 2024 22:30:29 -0400
Subject: [PATCH 12/32] firecracker: nixfmt

---
 .../virtualization/firecracker/default.nix    | 37 +++++++++++++------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/applications/virtualization/firecracker/default.nix
index a0fa2f76a420..c4e705206273 100644
--- a/pkgs/applications/virtualization/firecracker/default.nix
+++ b/pkgs/applications/virtualization/firecracker/default.nix
@@ -1,20 +1,29 @@
-{ fetchurl, lib, stdenv }:
+{
+  fetchurl,
+  lib,
+  stdenv,
+}:
 
 let
   version = "1.8.0";
   # nixpkgs-update: no auto update
 
-  suffix = {
-    x86_64-linux = "x86_64";
-    aarch64-linux = "aarch64";
-  }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
+  suffix =
+    {
+      x86_64-linux = "x86_64";
+      aarch64-linux = "aarch64";
+    }
+    ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
 
   baseurl = "https://github.com/firecracker-microvm/firecracker/releases/download";
 
-  dlbin = hash: fetchurl {
-    url = "${baseurl}/v${version}/firecracker-v${version}-${suffix}.tgz";
-    hash = hash."${stdenv.hostPlatform.system}"or (throw "unsupported system ${stdenv.hostPlatform.system}");
-  };
+  dlbin =
+    hash:
+    fetchurl {
+      url = "${baseurl}/v${version}/firecracker-v${version}-${suffix}.tgz";
+      hash =
+        hash."${stdenv.hostPlatform.system}" or (throw "unsupported system ${stdenv.hostPlatform.system}");
+    };
 
 in
 stdenv.mkDerivation {
@@ -53,7 +62,13 @@ stdenv.mkDerivation {
     changelog = "https://github.com/firecracker-microvm/firecracker/releases/tag/v${version}";
     mainProgram = "firecracker";
     license = licenses.asl20;
-    platforms = [ "x86_64-linux" "aarch64-linux" ];
-    maintainers = with maintainers; [ thoughtpolice qjoly ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
+    maintainers = with maintainers; [
+      thoughtpolice
+      qjoly
+    ];
   };
 }

From 307313162eefd4bda516b87d1fc9a5d2267acd25 Mon Sep 17 00:00:00 2001
From: techknowlogick <techknowlogick@gitea.com>
Date: Thu, 8 Aug 2024 22:32:05 -0400
Subject: [PATCH 13/32] firecracker: move to pkgs/by-name

---
 .../default.nix => by-name/fi/firecracker/package.nix}          | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/virtualization/firecracker/default.nix => by-name/fi/firecracker/package.nix} (100%)

diff --git a/pkgs/applications/virtualization/firecracker/default.nix b/pkgs/by-name/fi/firecracker/package.nix
similarity index 100%
rename from pkgs/applications/virtualization/firecracker/default.nix
rename to pkgs/by-name/fi/firecracker/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f038510a9820..4fc6e51607c0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5108,8 +5108,6 @@ with pkgs;
 
   fioctl = callPackage ../tools/admin/fioctl { };
 
-  firecracker = callPackage ../applications/virtualization/firecracker { };
-
   firectl = callPackage ../applications/virtualization/firectl { };
 
   firestarter = callPackage ../applications/misc/firestarter { };

From 5ad7419dcd89517bc8f743166d7b58dcd0dfaa7e Mon Sep 17 00:00:00 2001
From: techknowlogick <techknowlogick@gitea.com>
Date: Thu, 8 Aug 2024 22:32:52 -0400
Subject: [PATCH 14/32] firecracker: add techknowlogick as maintainer

---
 pkgs/by-name/fi/firecracker/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/fi/firecracker/package.nix b/pkgs/by-name/fi/firecracker/package.nix
index c4e705206273..7f93af1ced70 100644
--- a/pkgs/by-name/fi/firecracker/package.nix
+++ b/pkgs/by-name/fi/firecracker/package.nix
@@ -69,6 +69,7 @@ stdenv.mkDerivation {
     maintainers = with maintainers; [
       thoughtpolice
       qjoly
+      techknowlogick
     ];
   };
 }

From 01542ebea577511aa04605e2807fcaa0959ae900 Mon Sep 17 00:00:00 2001
From: Nicolas Goudry <goudry.nicolas@gmail.com>
Date: Fri, 9 Aug 2024 10:58:13 +0200
Subject: [PATCH 15/32] gitkraken: 10.1.1 -> 10.2.0

---
 .../applications/version-management/gitkraken/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index 03e4243265c8..9f867d9f3b3e 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -11,24 +11,24 @@ with lib;
 
 let
   pname = "gitkraken";
-  version = "10.1.1";
+  version = "10.2.0";
 
   throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
 
   srcs = {
     x86_64-linux = fetchzip {
       url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
-      hash = "sha256-+Bm6zEw9Q4FFgoXuSSQ9IFVVbyIenN5UN6VChqvESQI=";
+      hash = "sha256-NY7IgUt6Q27Pz1K46xL4LYFBwTJdT+fvsFDM2OhoPWg=";
     };
 
     x86_64-darwin = fetchzip {
       url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip";
-      hash = "sha256-6UjGiStMRr9fsNfJGMlhawR7PccMA9l9osAL4d/6ehc=";
+      hash = "sha256-e7zIMJNMdFy7/8zsV3nH1OT76xNznoSPRUVhoLfR6QI=";
     };
 
     aarch64-darwin = fetchzip {
       url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip";
-      hash = "sha256-FwI0GmarKneOuDyTgwOH1xSMy1wT/sbQ0XA3nUYqFmQ=";
+      hash = "sha256-YjGH9tKbJaYc5qENBCCpJGWWFJIQTD8O2H3onhMwGrw=";
     };
   };
 

From 078cde86333c0d507d976ef8e82a16583671332c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 9 Aug 2024 09:31:29 +0000
Subject: [PATCH 16/32] binary: 0.3.1 -> 4.0

---
 pkgs/by-name/bi/binary/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bi/binary/package.nix b/pkgs/by-name/bi/binary/package.nix
index fef93db98987..584458719c68 100644
--- a/pkgs/by-name/bi/binary/package.nix
+++ b/pkgs/by-name/bi/binary/package.nix
@@ -16,14 +16,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "binary";
-  version = "0.3.1";
+  version = "4.0";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "fizzyizzy05";
     repo = "binary";
     rev = "refs/tags/${version}";
-    hash = "sha256-4Ep7d5grMXCCy9tL8wquJsx13jVIp+piDPeJh6mYFpI=";
+    hash = "sha256-sIW20yHNPBeGSV9Rx7GMpuWpSkVgk5YMJoeYEq7Ag6s=";
   };
 
   nativeBuildInputs = [

From 03edcfd04d2334d654d3c3dd5ca7655b4338619f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 9 Aug 2024 09:45:36 +0000
Subject: [PATCH 17/32] sophus: 1.22.10 -> 1.24.6

---
 pkgs/by-name/so/sophus/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/so/sophus/package.nix b/pkgs/by-name/so/sophus/package.nix
index e748e864d0ce..aa1f6639a4db 100644
--- a/pkgs/by-name/so/sophus/package.nix
+++ b/pkgs/by-name/so/sophus/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sophus";
-  version = "1.22.10";
+  version = "1.24.6";
 
   src = fetchFromGitHub {
     owner = "strasdat";
     repo = "Sophus";
     rev = finalAttrs.version;
-    hash = "sha256-TNuUoL9r1s+kGE4tCOGFGTDv1sLaHJDUKa6c9x41Z7w=";
+    hash = "sha256-k5t3kSUrH6B1f60dtqq3Ai4R4D2h+Ld+6Cpljl/AN0w=";
   };
 
   nativeBuildInputs = [

From c55eb12ca452971a349c4ea8d3a487e6cd40f044 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Tue, 2 Jul 2024 03:02:43 +0800
Subject: [PATCH 18/32] python3Packages.cmsdials: init at 1.2.0

Co-authored-by: OTABI Tomoya <tomoya.otabi@gmail.com>
---
 .../python-modules/cmsdials/default.nix       | 53 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 55 insertions(+)
 create mode 100644 pkgs/development/python-modules/cmsdials/default.nix

diff --git a/pkgs/development/python-modules/cmsdials/default.nix b/pkgs/development/python-modules/cmsdials/default.nix
new file mode 100644
index 000000000000..3f06a5077b16
--- /dev/null
+++ b/pkgs/development/python-modules/cmsdials/default.nix
@@ -0,0 +1,53 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  poetry-core,
+  pydantic,
+  requests,
+  typing-extensions,
+  pandas,
+  tqdm,
+}:
+
+buildPythonPackage rec {
+  pname = "cmsdials";
+  version = "1.2.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "cms-DQM";
+    repo = "dials-py";
+    rev = "v${version}";
+    hash = "sha256-664FvPdZFU5eTcMadnHfs0ZeiKqTH+Gy2bnhIFQxU2o=";
+  };
+
+  build-system = [ poetry-core ];
+
+  dependencies = [
+    pydantic
+    requests
+    typing-extensions
+  ];
+
+  optional-dependencies = {
+    pandas = [ pandas ];
+    tqdm = [ tqdm ];
+  };
+
+  pythonRelaxDeps = [
+    # pydantic = "<2, >=1"pydantic = "<2, >=1"
+    "pydantic"
+    # typing-extensions = "<4.6.0, >=3.6.6"
+    "typing-extensions"
+  ];
+
+  pythonImportsCheck = [ "cmsdials" ];
+
+  meta = with lib; {
+    description = "Python API client interface to CMS DIALS service";
+    homepage = "https://github.com/cms-DQM/dials-py";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ ShamrockLee ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 15b05f4b9fb8..c26414b10704 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2375,6 +2375,8 @@ self: super: with self; {
     inherit (pkgs) cmigemo;
   };
 
+  cmsdials = callPackage ../development/python-modules/cmsdials { };
+
   cmsis-pack-manager = callPackage ../development/python-modules/cmsis-pack-manager { };
 
   cmsis-svd = callPackage ../development/python-modules/cmsis-svd { };

From f54f488fd9a130e78732e5eecb76100978a46b31 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 9 Aug 2024 17:17:54 +0000
Subject: [PATCH 19/32] gowall: 0.1.5 -> 0.1.6

---
 pkgs/by-name/go/gowall/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/go/gowall/package.nix b/pkgs/by-name/go/gowall/package.nix
index d15d388c24a2..b32a41769c71 100644
--- a/pkgs/by-name/go/gowall/package.nix
+++ b/pkgs/by-name/go/gowall/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "gowall";
-  version = "0.1.5";
+  version = "0.1.6";
 
   src = fetchFromGitHub {
     owner = "Achno";
     repo = "gowall";
     rev = "v${version}";
-    hash = "sha256-4h7vRu1aqCGccKx2UiLSFNloqf22QUml4BHkKzzdwYA=";
+    hash = "sha256-BNksshg1yK3mQuBaC4S3HzwfJ8vW0XxfDkG7YJAF00E=";
   };
 
   vendorHash = "sha256-jNx4ehew+IBx7M6ey/rT0vb53+9OBVYSEDJv8JWfZIw=";

From 3913c83677ce1797f93fee46105848361119b68e Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 9 Aug 2024 23:24:35 +0200
Subject: [PATCH 20/32] python311Packages.cohere: 5.7.0 -> 5.8.0

Diff: https://github.com/cohere-ai/cohere-python/compare/refs/tags/5.7.0...5.8.0

Changelog: https://github.com/cohere-ai/cohere-python/releases/tag/5.8.0
---
 pkgs/development/python-modules/cohere/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix
index fb766bdb51ed..e6d43cbc5b9c 100644
--- a/pkgs/development/python-modules/cohere/default.nix
+++ b/pkgs/development/python-modules/cohere/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "cohere";
-  version = "5.7.0";
+  version = "5.8.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     owner = "cohere-ai";
     repo = "cohere-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-j8X+DLE6DOxaKoZC1J8eAWZUr3XsfY6RZMKrmJqQ6dw=";
+    hash = "sha256-ejqsiT0hDBusqOjDGaK6Wda3xr3iyZuQPFj0EDugcew=";
   };
 
   build-system = [ poetry-core ];

From 155b654f243507a1ab4e88b59c0cf63cdfee7857 Mon Sep 17 00:00:00 2001
From: Nicolas Goudry <goudry.nicolas@gmail.com>
Date: Sat, 10 Aug 2024 00:37:29 +0200
Subject: [PATCH 21/32] gitkraken: nixfmt-rfc-style formatting

---
 .../version-management/gitkraken/default.nix  | 122 ++++++++++++++----
 1 file changed, 97 insertions(+), 25 deletions(-)

diff --git a/pkgs/applications/version-management/gitkraken/default.nix b/pkgs/applications/version-management/gitkraken/default.nix
index 9f867d9f3b3e..80c890046895 100644
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@@ -1,10 +1,58 @@
-{ lib, stdenv, libXcomposite, libgnome-keyring, makeWrapper, udev, curlWithGnuTls, alsa-lib
-, libXfixes, atk, gtk3, libXrender, pango, adwaita-icon-theme, cairo, freetype, fontconfig
-, libX11, libXi, libxcb, libXext, libXcursor, glib, libXScrnSaver, libxkbfile, libXtst
-, nss, nspr, cups, fetchzip, expat, gdk-pixbuf, libXdamage, libXrandr, dbus
-, makeDesktopItem, openssl, wrapGAppsHook3, makeShellWrapper, at-spi2-atk, at-spi2-core, libuuid
-, e2fsprogs, krb5, libdrm, mesa, unzip, copyDesktopItems, libxshmfence, libxkbcommon, git
-, libGL, zlib, cacert
+{
+  lib,
+  stdenv,
+  libXcomposite,
+  libgnome-keyring,
+  makeWrapper,
+  udev,
+  curlWithGnuTls,
+  alsa-lib,
+  libXfixes,
+  atk,
+  gtk3,
+  libXrender,
+  pango,
+  adwaita-icon-theme,
+  cairo,
+  freetype,
+  fontconfig,
+  libX11,
+  libXi,
+  libxcb,
+  libXext,
+  libXcursor,
+  glib,
+  libXScrnSaver,
+  libxkbfile,
+  libXtst,
+  nss,
+  nspr,
+  cups,
+  fetchzip,
+  expat,
+  gdk-pixbuf,
+  libXdamage,
+  libXrandr,
+  dbus,
+  makeDesktopItem,
+  openssl,
+  wrapGAppsHook3,
+  makeShellWrapper,
+  at-spi2-atk,
+  at-spi2-core,
+  libuuid,
+  e2fsprogs,
+  krb5,
+  libdrm,
+  mesa,
+  unzip,
+  copyDesktopItems,
+  libxshmfence,
+  libxkbcommon,
+  git,
+  libGL,
+  zlib,
+  cacert,
 }:
 
 with lib;
@@ -40,12 +88,22 @@ let
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = licenses.unfree;
     platforms = builtins.attrNames srcs;
-    maintainers = with maintainers; [ xnwdd evanjs arkivm nicolas-goudry ];
+    maintainers = with maintainers; [
+      xnwdd
+      evanjs
+      arkivm
+      nicolas-goudry
+    ];
     mainProgram = "gitkraken";
   };
 
   linux = stdenv.mkDerivation rec {
-    inherit pname version src meta;
+    inherit
+      pname
+      version
+      src
+      meta
+      ;
 
     dontBuild = true;
     dontConfigure = true;
@@ -96,18 +154,26 @@ let
       zlib
     ];
 
-    desktopItems = [ (makeDesktopItem {
-      name = "GitKraken Desktop";
-      exec = "gitkraken";
-      icon = "gitkraken";
-      desktopName = "GitKraken Desktop";
-      genericName = "Git Client";
-      categories = [ "Development" ];
-      comment = "Unleash your repo";
-    }) ];
+    desktopItems = [
+      (makeDesktopItem {
+        name = "GitKraken Desktop";
+        exec = "gitkraken";
+        icon = "gitkraken";
+        desktopName = "GitKraken Desktop";
+        genericName = "Git Client";
+        categories = [ "Development" ];
+        comment = "Unleash your repo";
+      })
+    ];
 
-    nativeBuildInputs = [ copyDesktopItems (wrapGAppsHook3.override { makeWrapper = makeShellWrapper; }) ];
-    buildInputs = [ gtk3 adwaita-icon-theme ];
+    nativeBuildInputs = [
+      copyDesktopItems
+      (wrapGAppsHook3.override { makeWrapper = makeShellWrapper; })
+    ];
+    buildInputs = [
+      gtk3
+      adwaita-icon-theme
+    ];
 
     # avoid double-wrapping
     dontWrapGApps = true;
@@ -159,9 +225,17 @@ let
   };
 
   darwin = stdenv.mkDerivation {
-    inherit pname version src meta;
+    inherit
+      pname
+      version
+      src
+      meta
+      ;
 
-    nativeBuildInputs = [ unzip makeWrapper ];
+    nativeBuildInputs = [
+      unzip
+      makeWrapper
+    ];
 
     installPhase = ''
       runHook preInstall
@@ -177,6 +251,4 @@ let
     dontFixup = true;
   };
 in
-if stdenv.isDarwin
-then darwin
-else linux
+if stdenv.isDarwin then darwin else linux

From da5490d3867e908744e5375fbbaf1efa911d3037 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 9 Aug 2024 22:42:20 +0000
Subject: [PATCH 22/32] audiobookshelf: 2.11.0 -> 2.12.2

---
 pkgs/by-name/au/audiobookshelf/source.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/au/audiobookshelf/source.json b/pkgs/by-name/au/audiobookshelf/source.json
index d0bc063a5b46..9295679a785d 100644
--- a/pkgs/by-name/au/audiobookshelf/source.json
+++ b/pkgs/by-name/au/audiobookshelf/source.json
@@ -1,9 +1,9 @@
 {
   "owner": "advplyr",
   "repo": "audiobookshelf",
-  "rev": "93114b2181d1ee5f0026fcf04c0a2946e3e96641",
-  "hash": "sha256-WrXbckMCysHgCl+ji0vCYoGu2DcjRf9wfSxzPYu7uZ8=",
-  "version": "2.11.0",
-  "depsHash": "sha256-B9ADqBGFfgNvWUgm6P+Tpg3N/tyBmeL5pyYXFTiBYpc=",
-  "clientDepsHash": "sha256-EvTUvynnukEzgC/y8v7BHj3oV5U9SeLjF+lAueS36D0="
+  "rev": "e81b3461b2b6374d2868fd415a7bbb899bd2f837",
+  "hash": "sha256-q3XDEi5DNvXxgcLYm4vI3my3wHPAjHMmEO1eiYD38Pw=",
+  "version": "2.12.2",
+  "depsHash": "sha256-XUKqkrh+RzTmPckh2YAcdu5sfO7HRw1fuYOlPeePZ7w=",
+  "clientDepsHash": "sha256-A5cnzb+/ImpCb/pPTZN+puf3FDKkD+dB+T6KLJcbx5w="
 }

From 9016bcdde112f788ccd14ebce329020a09b3ca82 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 Aug 2024 00:12:57 +0000
Subject: [PATCH 23/32] opentofu: 1.8.0 -> 1.8.1

---
 pkgs/applications/networking/cluster/opentofu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/opentofu/default.nix b/pkgs/applications/networking/cluster/opentofu/default.nix
index d278663f7269..74d5fd9b30f2 100644
--- a/pkgs/applications/networking/cluster/opentofu/default.nix
+++ b/pkgs/applications/networking/cluster/opentofu/default.nix
@@ -14,13 +14,13 @@
 let
   package =  buildGoModule rec {
     pname = "opentofu";
-    version = "1.8.0";
+    version = "1.8.1";
 
     src = fetchFromGitHub {
       owner = "opentofu";
       repo = "opentofu";
       rev = "v${version}";
-      hash = "sha256-c12CkfJyA5NjsOm/85QS41RfpBRW4pDX/vH6lk+d+9M=";
+      hash = "sha256-mMp3X2jXBQi/lRbqdiBa1UMYPKXl4jEvTHXxbPji5D8=";
     };
 
     vendorHash = "sha256-cM2DSP2ss3vleUhPBIdyxKeWJxtHpdjL5b5HVS/iC6o=";

From 29cef3de5c17aaa0f5499d5ad8651c58814b96b3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 10 Aug 2024 02:12:50 +0200
Subject: [PATCH 24/32] python312Packages.tensorflow-bin: unbreak

For some reason we have a distutils package now, and that unbreaks it
until tensorflow upstream gets its shit together.
---
 pkgs/development/python-modules/tensorflow/bin.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/tensorflow/bin.nix b/pkgs/development/python-modules/tensorflow/bin.nix
index bb476a724052..140a77942dab 100644
--- a/pkgs/development/python-modules/tensorflow/bin.nix
+++ b/pkgs/development/python-modules/tensorflow/bin.nix
@@ -4,7 +4,6 @@
   fetchurl,
   buildPythonPackage,
   isPy3k,
-  pythonAtLeast,
   astor,
   gast,
   google-pasta,
@@ -18,6 +17,7 @@
   grpcio,
   mock,
   scipy,
+  distutils,
   wheel,
   jax,
   opt-einsum,
@@ -90,7 +90,10 @@ buildPythonPackage {
     h5py
   ] ++ lib.optional (!isPy3k) mock;
 
-  build-system = [ wheel ] ++ lib.optionals cudaSupport [ addDriverRunpath ];
+  build-system = [
+    distutils
+    wheel
+  ] ++ lib.optionals cudaSupport [ addDriverRunpath ];
 
   preConfigure = ''
     unset SOURCE_DATE_EPOCH
@@ -217,9 +220,5 @@ buildPythonPackage {
       abbradar
     ];
     badPlatforms = [ "x86_64-darwin" ];
-    # Cannot import tensortfow on python 3.12 as it still dependends on distutils:
-    # ModuleNotFoundError: No module named 'distutils'
-    # https://github.com/tensorflow/tensorflow/issues/58073
-    broken = pythonAtLeast "3.12";
   };
 }

From 419c0fbb9279f32be472730596ce88996bd4836d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 10 Aug 2024 00:35:10 +0000
Subject: [PATCH 25/32] dotenvx: 1.6.4 -> 1.7.0

---
 pkgs/by-name/do/dotenvx/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/do/dotenvx/package.nix b/pkgs/by-name/do/dotenvx/package.nix
index 91107197e3f4..a2dae9664cb9 100644
--- a/pkgs/by-name/do/dotenvx/package.nix
+++ b/pkgs/by-name/do/dotenvx/package.nix
@@ -8,16 +8,16 @@
 
 buildNpmPackage rec {
   pname = "dotenvx";
-  version = "1.6.4";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "dotenvx";
     repo = "dotenvx";
     rev = "refs/tags/v${version}";
-    hash = "sha256-A7RojzdBwJ06JHBAoxVmOi9cAxoeGTwAK08jmST7pls=";
+    hash = "sha256-AEgf46LCqQCKdq7yEvvumtVVZltPUn8ktLuFiLJar3g=";
   };
 
-  npmDepsHash = "sha256-KToJAeWsCeJ2GO/k5UuOa/7oOYjNsS0kMt0o+yDyppM=";
+  npmDepsHash = "sha256-TdMGkw5/aP9Ki65Ik7286fH5FD5VAfFgATul9ZOHWxA=";
 
   dontNpmBuild = true;
 

From 43e81c18d390afaa6d399d9160efc759185827af Mon Sep 17 00:00:00 2001
From: Pyrox <pyrox@pyrox.dev>
Date: Fri, 26 Jul 2024 15:10:25 -0400
Subject: [PATCH 26/32] python312Packages.chart-studio: Remove nose dependency

---
 .../python-modules/chart-studio/default.nix       | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix
index 69c7cd19cc2a..da3f85f58ddc 100644
--- a/pkgs/development/python-modules/chart-studio/default.nix
+++ b/pkgs/development/python-modules/chart-studio/default.nix
@@ -3,13 +3,13 @@
   buildPythonPackage,
   fetchFromGitHub,
   mock,
-  nose,
   plotly,
   pytest,
   requests,
   retrying,
   setuptools,
   six,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
@@ -38,14 +38,19 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     mock
-    nose
+    pytestCheckHook
     pytest
   ];
-  # most tests talk to a service
-  checkPhase = ''
-    HOME=$TMPDIR pytest chart_studio/tests/test_core chart_studio/tests/test_plot_ly/test_api
+  preCheck = ''
+    export HOME=$(mktemp -d)
   '';
 
+  # most tests talk to a network service, so only run ones that don't
+  pytestFlagsArray = [
+    "chart_studio/tests/test_core"
+    "chart_studio/tests/test_plot_ly/test_api"
+  ];
+
   meta = with lib; {
     description = "Utilities for interfacing with Plotly's Chart Studio service";
     homepage = "https://github.com/plotly/plotly.py/tree/master/packages/python/chart-studio";

From 47ad667debf16904322f4a35e93ed506ed4866ed Mon Sep 17 00:00:00 2001
From: Pyrox <pyrox@pyrox.dev>
Date: Fri, 26 Jul 2024 15:11:15 -0400
Subject: [PATCH 27/32] python312Packages.chart-studio: Modernize

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

diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix
index da3f85f58ddc..e3affbee36d3 100644
--- a/pkgs/development/python-modules/chart-studio/default.nix
+++ b/pkgs/development/python-modules/chart-studio/default.nix
@@ -27,9 +27,9 @@ buildPythonPackage rec {
 
   sourceRoot = "${src.name}/packages/python/chart-studio";
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     plotly
     requests
     retrying
@@ -51,10 +51,10 @@ buildPythonPackage rec {
     "chart_studio/tests/test_plot_ly/test_api"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Utilities for interfacing with Plotly's Chart Studio service";
     homepage = "https://github.com/plotly/plotly.py/tree/master/packages/python/chart-studio";
-    license = with licenses; [ mit ];
+    license = with lib.licenses; [ mit ];
     maintainers = [ ];
   };
 }

From 55e56b8e841a6451c4a560aa7560c468e87d76be Mon Sep 17 00:00:00 2001
From: Pyrox <pyrox@pyrox.dev>
Date: Fri, 26 Jul 2024 18:13:17 -0400
Subject: [PATCH 28/32] python312Packages.chart-studio: 5.23.0 ->
 1.1.0-unstable-2024-07-23

---
 .../python-modules/chart-studio/default.nix          | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/chart-studio/default.nix b/pkgs/development/python-modules/chart-studio/default.nix
index e3affbee36d3..b850ed89301e 100644
--- a/pkgs/development/python-modules/chart-studio/default.nix
+++ b/pkgs/development/python-modules/chart-studio/default.nix
@@ -4,24 +4,23 @@
   fetchFromGitHub,
   mock,
   plotly,
-  pytest,
   requests,
   retrying,
   setuptools,
-  six,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "chart-studio";
-  version = "5.23.0";
+  version = "1.1.0-unstable-2024-07-23";
   pyproject = true;
 
   # chart-studio was split from plotly
   src = fetchFromGitHub {
     owner = "plotly";
     repo = "plotly.py";
-    rev = "refs/tags/v${version}";
+    # We use plotly's upstream version as it's the same repo, but chart studio has its own version number.
+    rev = "v5.23.0";
     hash = "sha256-K1hEs00AGBCe2fgytyPNWqE5M0jU5ESTzynP55kc05Y=";
   };
 
@@ -33,19 +32,18 @@ buildPythonPackage rec {
     plotly
     requests
     retrying
-    six
   ];
 
   nativeCheckInputs = [
     mock
     pytestCheckHook
-    pytest
   ];
+
   preCheck = ''
     export HOME=$(mktemp -d)
   '';
 
-  # most tests talk to a network service, so only run ones that don't
+  # most tests talk to a network service, so only run ones that don't do that.
   pytestFlagsArray = [
     "chart_studio/tests/test_core"
     "chart_studio/tests/test_plot_ly/test_api"

From 5d302195373d79969df2805d7b56b2b4b3457c14 Mon Sep 17 00:00:00 2001
From: Pyrox <pyrox@pyrox.dev>
Date: Fri, 9 Aug 2024 21:31:40 -0400
Subject: [PATCH 29/32] python312Packages.pycontracts: drop

---
 .../python-modules/pycontracts/default.nix    | 35 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 --
 3 files changed, 1 insertion(+), 37 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pycontracts/default.nix

diff --git a/pkgs/development/python-modules/pycontracts/default.nix b/pkgs/development/python-modules/pycontracts/default.nix
deleted file mode 100644
index 7286de19ab78..000000000000
--- a/pkgs/development/python-modules/pycontracts/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  nose,
-  pyparsing,
-  decorator,
-  six,
-  future,
-}:
-
-buildPythonPackage rec {
-  pname = "pycontracts";
-  version = "1.8.14";
-
-  src = fetchPypi {
-    pname = "PyContracts";
-    inherit version;
-    sha256 = "03q5m595ysjrc9h57m7prrca6b9l4yrzvdijnzxnhd61p7jzbh49";
-  };
-
-  buildInputs = [ nose ];
-  propagatedBuildInputs = [
-    pyparsing
-    decorator
-    six
-    future
-  ];
-
-  meta = with lib; {
-    description = "Allows to declare constraints on function parameters and return values";
-    homepage = "https://pypi.python.org/pypi/PyContracts";
-    license = licenses.lgpl2;
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 6731ffcb9a74..cca1a0faa604 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -386,6 +386,7 @@ mapAliases ({
   pyalmond = throw "pyalmond has been removed, since its API endpoints have been shutdown"; # added 2023-02-02
   pyblake2 = throw "pyblake2 is deprecated in favor of hashlib"; # added 2023-04-23
   pyblock = throw "pyblock has been removed, since it is abandoned and broken"; # added 2023-06-20
+  pycontracts = throw "pycontracts has been removed, since upstream is no longer active and it is broken on modern Python versions."; # added 2024-08-09
   pydrive = throw "pydrive is broken and deprecated and has been replaced with pydrive2."; # added 2022-06-01
   pyjet = throw "pyjet is deprecated, use fastjet instead"; # added 2023-05-10
   pygame_sdl2 = pygame-sdl2; # added 2024-01-07
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 66423898d7c7..0e425e99901f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11133,8 +11133,6 @@ self: super: with self; {
 
   pycomfoconnect = callPackage ../development/python-modules/pycomfoconnect { };
 
-  pycontracts = callPackage ../development/python-modules/pycontracts { };
-
   pycosat = callPackage ../development/python-modules/pycosat { };
 
   pycotap = callPackage ../development/python-modules/pycotap { };

From 8ea77fe071c85e922ea9b3de9c59c4cc9eadd6aa Mon Sep 17 00:00:00 2001
From: Pyrox <pyrox@pyrox.dev>
Date: Mon, 29 Jul 2024 01:58:44 -0400
Subject: [PATCH 30/32] python312Packages.locationsharinglib: drop nose
 dependency

---
 .../locationsharinglib/default.nix             | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/locationsharinglib/default.nix b/pkgs/development/python-modules/locationsharinglib/default.nix
index 76f818210e1a..be9adbf710da 100644
--- a/pkgs/development/python-modules/locationsharinglib/default.nix
+++ b/pkgs/development/python-modules/locationsharinglib/default.nix
@@ -1,12 +1,9 @@
 {
   lib,
-  betamax,
   buildPythonPackage,
   cachetools,
   coloredlogs,
-  emoji,
   fetchPypi,
-  nose,
   pythonOlder,
   pytz,
   requests,
@@ -30,13 +27,6 @@ buildPythonPackage rec {
     cachetools
     pytz
   ];
-
-  nativeCheckInputs = [
-    betamax
-    emoji
-    nose
-  ];
-
   postPatch = ''
     # Tests requirements want to pull in multiple modules which we don't need
     substituteInPlace setup.py \
@@ -46,12 +36,8 @@ buildPythonPackage rec {
       --replace "pytz>=2023.3" "pytz"
   '';
 
-  checkPhase = ''
-    runHook preCheck
-    # Only coverage no real unit tests
-    nosetests
-    runHook postCheck
-  '';
+  # There are no tests
+  doCheck = false;
 
   pythonImportsCheck = [ "locationsharinglib" ];
 

From 3621f09038c2eb83760a785211770650d658bbc7 Mon Sep 17 00:00:00 2001
From: Pyrox <pyrox@pyrox.dev>
Date: Mon, 29 Jul 2024 02:01:38 -0400
Subject: [PATCH 31/32] python312Packages.locationsharinglib: modernize

---
 .../locationsharinglib/default.nix            | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/locationsharinglib/default.nix b/pkgs/development/python-modules/locationsharinglib/default.nix
index be9adbf710da..6b3791c29ac5 100644
--- a/pkgs/development/python-modules/locationsharinglib/default.nix
+++ b/pkgs/development/python-modules/locationsharinglib/default.nix
@@ -7,45 +7,47 @@
   pythonOlder,
   pytz,
   requests,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "locationsharinglib";
   version = "5.0.3";
-  format = "setuptools";
+  pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-ar5/gyDnby0aceqqHe8lTQaHafOub+IPKglmct4xEGM=";
   };
 
-  propagatedBuildInputs = [
+  postPatch = ''
+    # Tests requirements want to pull in multiple modules which we don't need
+    substituteInPlace setup.py \
+      --replace-fail "tests_require=test_requirements" "tests_require=[]"
+    cp .VERSION locationsharinglib/.VERSION
+  '';
+
+  build-system = [ setuptools ];
+
+  dependencies = [
     coloredlogs
     requests
     cachetools
     pytz
   ];
-  postPatch = ''
-    # Tests requirements want to pull in multiple modules which we don't need
-    substituteInPlace setup.py \
-      --replace "tests_require=test_requirements" "tests_require=[]"
-    substituteInPlace requirements.txt \
-      --replace "coloredlogs>=15.0.1" "coloredlogs" \
-      --replace "pytz>=2023.3" "pytz"
-  '';
 
   # There are no tests
   doCheck = false;
 
   pythonImportsCheck = [ "locationsharinglib" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python package to retrieve coordinates from a Google account";
     homepage = "https://locationsharinglib.readthedocs.io/";
     changelog = "https://github.com/costastf/locationsharinglib/blob/${version}/HISTORY.rst";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }

From 6461ca79df813081cebfeb4c1f39a3229f2e771b Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sat, 10 Aug 2024 03:59:06 +0200
Subject: [PATCH 32/32] python312Packages.flask-restful: remove unused nose
 argument

---
 pkgs/development/python-modules/flask-restful/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/flask-restful/default.nix b/pkgs/development/python-modules/flask-restful/default.nix
index fff1e2492f5b..ca27a3292c05 100644
--- a/pkgs/development/python-modules/flask-restful/default.nix
+++ b/pkgs/development/python-modules/flask-restful/default.nix
@@ -7,7 +7,6 @@
   flask,
   fetchpatch2,
   mock,
-  nose,
   pytestCheckHook,
   pythonOlder,
   pytz,
@@ -51,7 +50,6 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     blinker
     mock
-    nose
     pytestCheckHook
   ];