From 71c61fed8085f292c39c769024d67fccd0f514d2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 31 Aug 2023 00:21:32 +0000
Subject: [PATCH 01/41] gpxsee: 13.4 -> 13.7

---
 pkgs/applications/misc/gpxsee/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index c08deed34db0..babeb2a1044a 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -20,13 +20,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "gpxsee";
-  version = "13.4";
+  version = "13.7";
 
   src = fetchFromGitHub {
     owner = "tumic0";
     repo = "GPXSee";
     rev = version;
-    hash = "sha256-Zf2eyDx5QK69W6HNz/IGGHkX2qCDnxYsU8KLCgU9teY=";
+    hash = "sha256-Y3JcWkg0K724i/5Leyi8r26uKpq/aDwghJBG8xfxpd4=";
   };
 
   buildInputs = [ qtpbfimageplugin qtserialport ]

From 260a449f8ea36fa69ac50ad55277ab3ad15df288 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Fri, 1 Sep 2023 16:06:16 -0400
Subject: [PATCH 02/41] cel-go: 0.17.1 -> 0.18.0

Diff: https://github.com/google/cel-go/compare/v0.17.1...v0.18.0

Changelog: https://github.com/google/cel-go/releases/tag/v0.18.0
---
 .../interpreters/cel-go/default.nix           | 14 +++--
 .../interpreters/cel-go/go-mod-tidy.patch     | 52 +++++++++++++++++++
 2 files changed, 62 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/interpreters/cel-go/go-mod-tidy.patch

diff --git a/pkgs/development/interpreters/cel-go/default.nix b/pkgs/development/interpreters/cel-go/default.nix
index 613f332ed623..d6ce6c9cc68c 100644
--- a/pkgs/development/interpreters/cel-go/default.nix
+++ b/pkgs/development/interpreters/cel-go/default.nix
@@ -5,18 +5,24 @@
 
 buildGoModule rec {
   pname = "cel-go";
-  version = "0.17.1";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "cel-go";
     rev = "v${version}";
-    hash = "sha256-qk7jopOr/woWCi5j509K4bdlIybuZZ+UFTmTHEEw9/Y=";
+    hash = "sha256-+YGRcTlPKTdecMicW4UjupSnuuq5msfGKTP/bwOf7dw=";
   };
 
-  sourceRoot = "${src.name}/repl";
+  modRoot = "repl";
 
-  vendorHash = "sha256-OypSL91/2FVCF3ADNSJH33JxH0+3HxIziwmXHb/vZM4=";
+  vendorHash = "sha256-RSCZOR++WBoGffCQp114Sa1Dbms2tBa0xceVQ3skwR4=";
+
+  patches = [
+    # repl/go.mod and repl/go.sum are outdated
+    # ran `go mod tidy` in the repl directory
+    ./go-mod-tidy.patch
+  ];
 
   subPackages = [
     "main"
diff --git a/pkgs/development/interpreters/cel-go/go-mod-tidy.patch b/pkgs/development/interpreters/cel-go/go-mod-tidy.patch
new file mode 100644
index 000000000000..a1f4f06ae834
--- /dev/null
+++ b/pkgs/development/interpreters/cel-go/go-mod-tidy.patch
@@ -0,0 +1,52 @@
+--- a/repl/go.mod
++++ b/repl/go.mod
+@@ -6,16 +6,16 @@ require (
+ 	github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230321174746-8dcc6526cfb1
+ 	github.com/chzyer/readline v1.5.1
+ 	github.com/google/cel-go v0.14.0
+-	google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9
+-	google.golang.org/protobuf v1.30.0
++	google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5
++	google.golang.org/protobuf v1.31.0
+ )
+ 
+ require (
+ 	github.com/stoewer/go-strcase v1.3.0 // indirect
+ 	golang.org/x/exp v0.0.0-20230321023759-10a507213a29 // indirect
+-	golang.org/x/sys v0.7.0 // indirect
++	golang.org/x/sys v0.8.0 // indirect
+ 	golang.org/x/text v0.9.0 // indirect
+-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 // indirect
++	google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5 // indirect
+ )
+ 
+ replace github.com/google/cel-go => ../.
+--- a/repl/go.sum
++++ b/repl/go.sum
+@@ -26,18 +26,18 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
+ golang.org/x/exp v0.0.0-20230321023759-10a507213a29 h1:ooxPy7fPvB4kwsA2h+iBNHkAbp/4JxTSwCmvdjEYmug=
+ golang.org/x/exp v0.0.0-20230321023759-10a507213a29/go.mod h1:CxIveKay+FTh1D0yPZemJVgC/95VzuuOLq5Qi4xnoYc=
+ golang.org/x/sys v0.0.0-20220310020820-b874c991c1a5/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+-golang.org/x/sys v0.7.0 h1:3jlCCIQZPdOYu1h8BkNvLz8Kgwtae2cagcG/VamtZRU=
+-golang.org/x/sys v0.7.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
++golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
++golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+ golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
+ golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
+ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+-google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 h1:m8v1xLLLzMe1m5P+gCTF8nJB9epwZQUBERm20Oy1poQ=
+-google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig=
+-google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19 h1:0nDDozoAU19Qb2HwhXadU8OcsiO/09cnTqhUtq2MEOM=
+-google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19/go.mod h1:66JfowdXAEgad5O9NnYcsNPLCPZJD++2L9X0PCMODrA=
++google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5 h1:nIgk/EEq3/YlnmVVXVnm14rC2oxgs1o0ong4sD/rd44=
++google.golang.org/genproto/googleapis/api v0.0.0-20230803162519-f966b187b2e5/go.mod h1:5DZzOUPCLYL3mNkQ0ms0F3EuUNZ7py1Bqeq6sxzI7/Q=
++google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5 h1:eSaPbMR4T7WfH9FvABk36NBMacoTUKdWCvV0dx+KfOg=
++google.golang.org/genproto/googleapis/rpc v0.0.0-20230803162519-f966b187b2e5/go.mod h1:zBEcrKX2ZOcEkHWxBPAIvYUWOKKMIhYcmNiUIu2ji3I=
+ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+-google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
+-google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
++google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
++google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

From 40546adf106f1db89eb19ca925bb853b2d98beed Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 2 Sep 2023 11:07:35 +0200
Subject: [PATCH 03/41] python311Packages.bluetooth-data-tools: 1.9.1 -> 1.10.0

Diff: https://github.com/Bluetooth-Devices/bluetooth-data-tools/compare/refs/tags/v1.9.1...1.10.0

Changelog: https://github.com/Bluetooth-Devices/bluetooth-data-tools/blob/v1.10.0/CHANGELOG.md
---
 .../python-modules/bluetooth-data-tools/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bluetooth-data-tools/default.nix b/pkgs/development/python-modules/bluetooth-data-tools/default.nix
index 3a4f1f567e90..149083281de8 100644
--- a/pkgs/development/python-modules/bluetooth-data-tools/default.nix
+++ b/pkgs/development/python-modules/bluetooth-data-tools/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "bluetooth-data-tools";
-  version = "1.9.1";
+  version = "1.10.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "Bluetooth-Devices";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-DLB2mBjHPVT2Fg2Kr0WUDuu5nqBCbdu525wAD3ERKV8=";
+    hash = "sha256-Co9NbSaemkFND06NIyytICOo/bcdIjKU5dOliBdKTkk=";
   };
 
   # The project can build both an optimized cython version and an unoptimized

From 8c9adf8410bdaec5d394f464f659b9e2538ef21d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 2 Sep 2023 11:09:47 +0200
Subject: [PATCH 04/41] python311Packages.bluetooth-data-tools: 1.11.0 ->
 1.11.0

Diff: https://github.com/Bluetooth-Devices/bluetooth-data-tools/compare/refs/tags/v1.11.0...v1.11.0

Changelog: https://github.com/Bluetooth-Devices/bluetooth-data-tools/blob/v1.11.0/CHANGELOG.md
---
 .../python-modules/bluetooth-data-tools/default.nix      | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bluetooth-data-tools/default.nix b/pkgs/development/python-modules/bluetooth-data-tools/default.nix
index 149083281de8..920bb1cecc48 100644
--- a/pkgs/development/python-modules/bluetooth-data-tools/default.nix
+++ b/pkgs/development/python-modules/bluetooth-data-tools/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
+, cryptography
 , cython_3
 , poetry-core
 , pytestCheckHook
@@ -10,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "bluetooth-data-tools";
-  version = "1.10.0";
+  version = "1.11.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -19,7 +20,7 @@ buildPythonPackage rec {
     owner = "Bluetooth-Devices";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-Co9NbSaemkFND06NIyytICOo/bcdIjKU5dOliBdKTkk=";
+    hash = "sha256-iyfk0OOJezNCNyqRCbR2cTTTdgdYQM6hExTngd/3CtA=";
   };
 
   # The project can build both an optimized cython version and an unoptimized
@@ -32,6 +33,10 @@ buildPythonPackage rec {
     setuptools
   ];
 
+  propagatedBuildInputs = [
+    cryptography
+  ];
+
   nativeCheckInputs = [
     pytestCheckHook
   ];

From 875e737bfabe34b3976a1613b9810de52e497a49 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 2 Sep 2023 11:57:30 +0000
Subject: [PATCH 05/41] ants: 2.4.4 -> 2.5.0

---
 pkgs/applications/science/biology/ants/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix
index d71fbca4becd..a28a601fcda3 100644
--- a/pkgs/applications/science/biology/ants/default.nix
+++ b/pkgs/applications/science/biology/ants/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ANTs";
-  version = "2.4.4";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "ANTsX";
     repo = "ANTs";
     rev = "refs/tags/v${version}";
-    hash = "sha256-GQndI8ayBvqujb2/qXT6RBAfr8hNPCI5IbwYkPlyNg0=";
+    hash = "sha256-rSibcsprhMC1qsuZN8ou32QPLf8n62BiDzpnTRWRx0Q=";
   };
 
   nativeBuildInputs = [ cmake makeWrapper ];

From d24fd630f2a379b1b7b1dbf9ff812db0fe4458fc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 2 Sep 2023 15:13:23 +0200
Subject: [PATCH 06/41] trivy: 0.44.1 -> 0.45.0

Diff: https://github.com/aquasecurity/trivy/compare/refs/tags/v0.44.1...v0.45.0

Changelog: https://github.com/aquasecurity/trivy/releases/tag/v0.45.0
---
 pkgs/tools/admin/trivy/default.nix | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix
index 473cdb977bc1..147fed6f127d 100644
--- a/pkgs/tools/admin/trivy/default.nix
+++ b/pkgs/tools/admin/trivy/default.nix
@@ -1,23 +1,25 @@
 { lib
 , buildGoModule
 , fetchFromGitHub
+, testers
+, trivy
 }:
 
 buildGoModule rec {
   pname = "trivy";
-  version = "0.44.1";
+  version = "0.45.0";
 
   src = fetchFromGitHub {
     owner = "aquasecurity";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-zSrXfSG9GXReJ+XRx7FTBZovSvNq725zzWMje3maTx4=";
+    hash = "sha256-HsxcB3X8/n4Y8sU7im1nEGqMK9bVlhq5ZiF9gG+3YFs=";
   };
 
-  # hash missmatch on across linux and darwin
+  # Hash mismatch on across Linux and Darwin
   proxyVendor = true;
 
-  vendorHash = "sha256-CEr8UvQtKZo5jahLeLx3RYT592i6SwwNLRA4IRD0mYU=";
+  vendorHash = "sha256-rlMhmgnqvkKttfIzVMi1Ca/dqOdkoCF9yZbEcr8sv5I=";
 
   subPackages = [ "cmd/trivy" ];
 
@@ -32,12 +34,11 @@ buildGoModule rec {
 
   doInstallCheck = true;
 
-  installCheckPhase = ''
-    runHook preInstallCheck
-    $out/bin/trivy --help
-    $out/bin/trivy --version | grep "v${version}"
-    runHook postInstallCheck
-  '';
+  passthru.tests.version = testers.testVersion {
+    package = trivy;
+    command = "trivy --version";
+    version = "v${version}";
+  };
 
   meta = with lib; {
     homepage = "https://github.com/aquasecurity/trivy";

From b6d9587c8348de1af4c0f15e5e377ed73e7dc656 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Sat, 2 Sep 2023 09:29:46 -0400
Subject: [PATCH 07/41] cargo-about: 0.5.6 -> 0.5.7

Diff: https://github.com/EmbarkStudios/cargo-about/compare/0.5.6...0.5.7

Changelog: https://github.com/EmbarkStudios/cargo-about/blob/0.5.7/CHANGELOG.md
---
 pkgs/development/tools/rust/cargo-about/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-about/default.nix b/pkgs/development/tools/rust/cargo-about/default.nix
index 7af3b28817ae..75a9fd030e83 100644
--- a/pkgs/development/tools/rust/cargo-about/default.nix
+++ b/pkgs/development/tools/rust/cargo-about/default.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-about";
-  version = "0.5.6";
+  version = "0.5.7";
 
   src = fetchFromGitHub {
     owner = "EmbarkStudios";
     repo = "cargo-about";
     rev = version;
-    sha256 = "sha256-nlumcRcL5HwRJTNqLJ9+UkSg88HuE96Rg8Tgc+ZcK2M=";
+    sha256 = "sha256-AROT/Q/C0lbkeoMYmY2Tzt0+yRVA8ESRo5mPM1h0HJs=";
   };
 
-  cargoSha256 = "sha256-Fa1DGXzHDR3EAZyFg0g2aKFynQlC/LL+Tg5LKpOUzmM=";
+  cargoSha256 = "sha256-9HkaCUGo6jpzQn851ACM7kcBCkyMJJ/bb/qtV4Hp0lI=";
 
   nativeBuildInputs = [ pkg-config ];
 
@@ -36,5 +36,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/EmbarkStudios/cargo-about/blob/${version}/CHANGELOG.md";
     license = with licenses; [ mit /* or */ asl20 ];
     maintainers = with maintainers; [ evanjs figsoda matthiasbeyer ];
+    mainProgram = "cargo-about";
   };
 }

From 2701d140df8c12cb4c905b1a93089d88b88548d4 Mon Sep 17 00:00:00 2001
From: Mauricio Collares <mauricio@collares.org>
Date: Sat, 2 Sep 2023 08:46:11 -0700
Subject: [PATCH 08/41] treewide: fetch sage patches from github instead of
 now-defunct trac

---
 pkgs/applications/science/math/giac/default.nix           | 4 ++--
 pkgs/applications/science/math/maxima/default.nix         | 6 +++---
 pkgs/applications/science/math/ratpoints/default.nix      | 2 +-
 pkgs/data/misc/conway_polynomials/default.nix             | 2 +-
 pkgs/data/misc/elliptic_curves/default.nix                | 2 +-
 pkgs/development/compilers/ecl/16.1.2.nix                 | 2 +-
 pkgs/development/compilers/ecl/default.nix                | 2 +-
 pkgs/development/libraries/glpk/default.nix               | 2 +-
 pkgs/development/libraries/ppl/default.nix                | 2 +-
 .../development/libraries/science/math/rubiks/default.nix | 8 ++++----
 pkgs/development/python-modules/cypari2/default.nix       | 2 +-
 11 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix
index c7ae890c0738..752b05fe4feb 100644
--- a/pkgs/applications/science/math/giac/default.nix
+++ b/pkgs/applications/science/math/giac/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   patches = [
     (fetchpatch {
       name = "pari_2_11.patch";
-      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/giac/patches/pari_2_11.patch?id=21ba7540d385a9864b44850d6987893dfa16bfc0";
+      url = "https://raw.githubusercontent.com/sagemath/sage/21ba7540d385a9864b44850d6987893dfa16bfc0/build/pkgs/giac/patches/pari_2_11.patch";
       sha256 = "sha256-vEo/5MNzMdYRPWgLFPsDcMT1W80Qzj4EPBjx/B8j68k=";
     })
 
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     # means some outputs differ in the make check. Patch around this:
     (fetchpatch {
       name = "nofltk-check.patch";
-      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/giac/patches/nofltk-check.patch?id=7553a3c8dfa7bcec07241a07e6a4e7dcf5bb4f26";
+      url = "https://raw.githubusercontent.com/sagemath/sage/7553a3c8dfa7bcec07241a07e6a4e7dcf5bb4f26/build/pkgs/giac/patches/nofltk-check.patch";
       sha256 = "sha256-nAl5q3ufLjK3X9s0qMlGNowdRRf3EaC24eVtJABzdXY=";
     })
   ];
diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix
index 9d1b5c09b825..c102c645b3bf 100644
--- a/pkgs/applications/science/math/maxima/default.nix
+++ b/pkgs/applications/science/math/maxima/default.nix
@@ -63,20 +63,20 @@ stdenv.mkDerivation rec {
   patches = [
     # fix path to info dir (see https://trac.sagemath.org/ticket/11348)
     (fetchpatch {
-      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/infodir.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
+      url = "https://raw.githubusercontent.com/sagemath/sage/07d6c37d18811e2b377a9689790a7c5e24da16ba/build/pkgs/maxima/patches/infodir.patch";
       sha256 = "09v64n60f7i6frzryrj0zd056lvdpms3ajky4f9p6kankhbiv21x";
     })
 
     # fix https://sourceforge.net/p/maxima/bugs/2596/
     (fetchpatch {
-      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/matrixexp.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
+      url = "https://raw.githubusercontent.com/sagemath/sage/07d6c37d18811e2b377a9689790a7c5e24da16ba/build/pkgs/maxima/patches/matrixexp.patch";
       sha256 = "06961hn66rhjijfvyym21h39wk98sfxhp051da6gz0n9byhwc6zg";
     })
 
     # undo https://sourceforge.net/p/maxima/code/ci/f5e9b0f7eb122c4e48ea9df144dd57221e5ea0ca
     # see https://trac.sagemath.org/ticket/13364#comment:93
     (fetchpatch {
-      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/maxima/patches/undoing_true_false_printing_patch.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
+      url = "https://raw.githubusercontent.com/sagemath/sage/07d6c37d18811e2b377a9689790a7c5e24da16ba/build/pkgs/maxima/patches/undoing_true_false_printing_patch.patch";
       sha256 = "0fvi3rcjv6743sqsbgdzazy9jb6r1p1yq63zyj9fx42wd1hgf7yx";
     })
   ];
diff --git a/pkgs/applications/science/math/ratpoints/default.nix b/pkgs/applications/science/math/ratpoints/default.nix
index 44c68ebcdcea..42e6b7d00a5e 100644
--- a/pkgs/applications/science/math/ratpoints/default.nix
+++ b/pkgs/applications/science/math/ratpoints/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   patches = [
     (fetchpatch {
-      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ratpoints/patches/sturm_and_rp_private.patch?id=1615f58890e8f9881c4228c78a6b39b9aab1303a";
+      url = "https://raw.githubusercontent.com/sagemath/sage/1615f58890e8f9881c4228c78a6b39b9aab1303a/build/pkgs/ratpoints/patches/sturm_and_rp_private.patch";
       sha256 = "0q3wajncyfr3gahd8gwk9x7g56zw54lpywrl63lqk7drkf60mrcl";
     })
   ];
diff --git a/pkgs/data/misc/conway_polynomials/default.nix b/pkgs/data/misc/conway_polynomials/default.nix
index 1f5c4d57f76a..caf470c51152 100644
--- a/pkgs/data/misc/conway_polynomials/default.nix
+++ b/pkgs/data/misc/conway_polynomials/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   # Script that creates the "database" (nested python array) and pickles it
   spkg-install = fetchurl {
-    url = "https://git.sagemath.org/sage.git/plain/build/pkgs/conway_polynomials/spkg-install.py?id=9.2";
+    url = "https://raw.githubusercontent.com/sagemath/sage/9.2/build/pkgs/conway_polynomials/spkg-install.py";
     sha256 = "1bwnqasnyv793hxg29viing4dnliz29grkhldsirq19d509yk1fs";
   };
 
diff --git a/pkgs/data/misc/elliptic_curves/default.nix b/pkgs/data/misc/elliptic_curves/default.nix
index 610977b882f7..55c03afbc4c2 100644
--- a/pkgs/data/misc/elliptic_curves/default.nix
+++ b/pkgs/data/misc/elliptic_curves/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   # Script that creates the sqlite database from the allcurves textfile
   spkg-install = fetchurl {
-    url = "https://git.sagemath.org/sage.git/plain/build/pkgs/${pname}/spkg-install.py?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
+    url = "https://raw.githubusercontent.com/sagemath/sage/07d6c37d18811e2b377a9689790a7c5e24da16ba/build/pkgs/${pname}/spkg-install.py";
     sha256 = "116g684i6mvs11fvb6fzfsr4fn903axn31vigdyb8bgpf8l4hvc5";
   };
 
diff --git a/pkgs/development/compilers/ecl/16.1.2.nix b/pkgs/development/compilers/ecl/16.1.2.nix
index f2b964370ab0..75055130ada2 100644
--- a/pkgs/development/compilers/ecl/16.1.2.nix
+++ b/pkgs/development/compilers/ecl/16.1.2.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
       # Rebased version of
       # https://gitlab.com/embeddable-common-lisp/ecl/commit/ac5f011f57a85a38627af154bc3ee7580e7fecd4.patch
       name = "getcwd.patch";
-      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/16.1.2-getcwd.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
+      url = "https://raw.githubusercontent.com/sagemath/sage/07d6c37d18811e2b377a9689790a7c5e24da16ba/build/pkgs/ecl/patches/16.1.2-getcwd.patch";
       sha256 = "1fbi8gn7rv8nqff5mpaijsrch3k3z7qc5cn4h1vl8qrr8xwqlqhb";
     })
     ./ecl-1.16.2-libffi-3.3-abi.patch
diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix
index 3a7836bbcdd1..bba1b3026362 100644
--- a/pkgs/development/compilers/ecl/default.nix
+++ b/pkgs/development/compilers/ecl/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
   patches = [
     # https://gitlab.com/embeddable-common-lisp/ecl/-/merge_requests/1
     (fetchpatch {
-      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ecl/patches/write_error.patch?h=9.2";
+      url = "https://raw.githubusercontent.com/sagemath/sage/9.2/build/pkgs/ecl/patches/write_error.patch";
       sha256 = "0hfxacpgn4919hg0mn4wf4m8r7y592r4gw7aqfnva7sckxi6w089";
     })
   ];
diff --git a/pkgs/development/libraries/glpk/default.nix b/pkgs/development/libraries/glpk/default.nix
index e8b01d6d2e7d..a78170909caa 100644
--- a/pkgs/development/libraries/glpk/default.nix
+++ b/pkgs/development/libraries/glpk/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
     # https://trac.sagemath.org/ticket/20710#comment:18
     (fetchpatch {
       name = "error_recovery.patch";
-      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/glpk/patches/error_recovery.patch?id=d3c1f607e32f964bf0cab877a63767c86fd00266";
+      url = "https://raw.githubusercontent.com/sagemath/sage/d3c1f607e32f964bf0cab877a63767c86fd00266/build/pkgs/glpk/patches/error_recovery.patch";
       sha256 = "sha256-2hNtUEoGTFt3JgUvLH3tPWnz+DZcXNhjXzS+/V89toA=";
     })
   ];
diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix
index a94cf9e38d0e..c9b456ba831e 100644
--- a/pkgs/development/libraries/ppl/default.nix
+++ b/pkgs/development/libraries/ppl/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   patches = [(fetchpatch {
     name = "clang5-support.patch";
-    url = "https://git.sagemath.org/sage.git/plain/build/pkgs/ppl/patches/clang5-support.patch?h=9.2";
+    url = "https://raw.githubusercontent.com/sagemath/sage/9.2/build/pkgs/ppl/patches/clang5-support.patch";
     sha256 = "1zj90hm25pkgvk4jlkfzh18ak9b98217gbidl3731fdccbw6hr87";
   })];
 
diff --git a/pkgs/development/libraries/science/math/rubiks/default.nix b/pkgs/development/libraries/science/math/rubiks/default.nix
index b4b670884989..505457edd64f 100644
--- a/pkgs/development/libraries/science/math/rubiks/default.nix
+++ b/pkgs/development/libraries/science/math/rubiks/default.nix
@@ -28,19 +28,19 @@ stdenv.mkDerivation rec {
     # Fix makefiles which use all the variables in all the wrong ways and
     # hardcode values for some variables.
     (fetchpatch {
-      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/rubiks/patches/dietz-cu2-Makefile.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
+      url = "https://raw.githubusercontent.com/sagemath/sage/07d6c37d18811e2b377a9689790a7c5e24da16ba/build/pkgs/rubiks/patches/dietz-cu2-Makefile.patch";
       sha256 = "1ry3w1mk9q4jqd91zlaa1bdiiplld4hpfjaldbhlmzlgrrc99qmq";
     })
     (fetchpatch {
-      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/rubiks/patches/dietz-mcube-Makefile.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
+      url = "https://raw.githubusercontent.com/sagemath/sage/07d6c37d18811e2b377a9689790a7c5e24da16ba/build/pkgs/rubiks/patches/dietz-mcube-Makefile.patch";
       sha256 = "0zsbh6k3kqdg82fv0kzghr1x7pafisv943gmssqscp107bhg77bz";
     })
     (fetchpatch {
-      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/rubiks/patches/dietz-solver-Makefile.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
+      url = "https://raw.githubusercontent.com/sagemath/sage/07d6c37d18811e2b377a9689790a7c5e24da16ba/build/pkgs/rubiks/patches/dietz-solver-Makefile.patch";
       sha256 = "0vhw70ylnmydgjhwx8jjlb2slccj4pfqn6vzirkyz1wp8apsmfhp";
     })
     (fetchpatch {
-      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/rubiks/patches/reid-Makefile.patch?id=07d6c37d18811e2b377a9689790a7c5e24da16ba";
+      url = "https://raw.githubusercontent.com/sagemath/sage/07d6c37d18811e2b377a9689790a7c5e24da16ba/build/pkgs/rubiks/patches/reid-Makefile.patch";
       sha256 = "1r311sn012xs135s0d21qwsig2kld7rdcq19nm0zbnklviid57df";
     })
   ];
diff --git a/pkgs/development/python-modules/cypari2/default.nix b/pkgs/development/python-modules/cypari2/default.nix
index 70cd89afdcad..4cdd8f31a5fd 100644
--- a/pkgs/development/python-modules/cypari2/default.nix
+++ b/pkgs/development/python-modules/cypari2/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     # (https://trac.sagemath.org/ticket/27267). depends on Cython patch.
     (fetchpatch {
       name = "use-trashcan-for-gen.patch";
-      url = "https://git.sagemath.org/sage.git/plain/build/pkgs/cypari/patches/trashcan.patch?id=b6ea17ef8e4d652de0a85047bac8d41e90b25555";
+      url = "https://raw.githubusercontent.com/sagemath/sage/b6ea17ef8e4d652de0a85047bac8d41e90b25555/build/pkgs/cypari/patches/trashcan.patch";
       hash = "sha256-w4kktWb9/aR9z4CjrUvAMOxEwRN2WkubaKzQttN8rU8=";
     })
   ];

From 0ddd19256a26833be04e72bb8c7000fd4361b289 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Sat, 2 Sep 2023 22:05:15 +0200
Subject: [PATCH 09/41] gpxsee: use `finalAttrs` pattern

---
 pkgs/applications/misc/gpxsee/default.nix | 33 +++++++++++++----------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index babeb2a1044a..890714c8c9e0 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -16,21 +16,22 @@
 
 let
   isQt6 = lib.versions.major qtbase.version == "6";
-
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "gpxsee";
   version = "13.7";
 
   src = fetchFromGitHub {
     owner = "tumic0";
     repo = "GPXSee";
-    rev = version;
+    rev = finalAttrs.version;
     hash = "sha256-Y3JcWkg0K724i/5Leyi8r26uKpq/aDwghJBG8xfxpd4=";
   };
 
-  buildInputs = [ qtpbfimageplugin qtserialport ]
-    ++ (if isQt6 then [
+  buildInputs = [
+    qtpbfimageplugin
+    qtserialport
+  ] ++ (if isQt6 then [
     qtbase
     qtpositioning
     qtsvg
@@ -39,7 +40,11 @@ stdenv.mkDerivation rec {
     qtlocation
   ]);
 
-  nativeBuildInputs = [ qmake qttools wrapQtAppsHook ];
+  nativeBuildInputs = [
+    qmake
+    qttools
+    wrapQtAppsHook
+  ];
 
   preConfigure = ''
     lrelease gpxsee.pro
@@ -56,17 +61,17 @@ stdenv.mkDerivation rec {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
+    broken = isQt6 && stdenv.isDarwin;
+    changelog = "https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes";
     description = "GPS log file viewer and analyzer";
+    homepage = "https://www.gpxsee.org/";
+    license = lib.licenses.gpl3Only;
     longDescription = ''
       GPXSee is a Qt-based GPS log file viewer and analyzer that supports
       all common GPS log file formats.
     '';
-    homepage = "https://www.gpxsee.org/";
-    changelog = "https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ womfoo sikmir ];
-    platforms = platforms.unix;
-    broken = isQt6 && stdenv.isDarwin;
+    maintainers = with lib.maintainers; [ womfoo sikmir ];
+    platforms = lib.platforms.unix;
   };
-}
+})

From 35145f9df092a476a7995018ec1115c97d426fee Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Sat, 2 Sep 2023 22:17:19 +0200
Subject: [PATCH 10/41] ants: reformat file using `nixpkgs-fmt`

---
 .../science/biology/ants/default.nix          | 38 ++++++++++++++-----
 1 file changed, 29 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix
index a28a601fcda3..dc0b16e9f4a6 100644
--- a/pkgs/applications/science/biology/ants/default.nix
+++ b/pkgs/applications/science/biology/ants/default.nix
@@ -1,4 +1,12 @@
-{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, itk, vtk, Cocoa }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, cmake
+, makeBinaryWrapper
+, itk
+, vtk
+, Cocoa
+}:
 
 stdenv.mkDerivation rec {
   pname = "ANTs";
@@ -11,10 +19,22 @@ stdenv.mkDerivation rec {
     hash = "sha256-rSibcsprhMC1qsuZN8ou32QPLf8n62BiDzpnTRWRx0Q=";
   };
 
-  nativeBuildInputs = [ cmake makeWrapper ];
-  buildInputs = [ itk vtk ] ++ lib.optionals stdenv.isDarwin [ Cocoa ];
+  nativeBuildInputs = [
+    cmake
+    makeBinaryWrapper
+  ];
 
-  cmakeFlags = [ "-DANTS_SUPERBUILD=FALSE" "-DUSE_VTK=TRUE" ];
+  buildInputs = [
+    itk
+    vtk
+  ] ++ lib.optionals stdenv.isDarwin [
+    Cocoa
+  ];
+
+  cmakeFlags = [
+    "-DANTS_SUPERBUILD=FALSE"
+    "-DUSE_VTK=TRUE"
+  ];
 
   postInstall = ''
     for file in $out/bin/*; do
@@ -22,11 +42,11 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  meta = with lib; {
-    homepage = "https://github.com/ANTsX/ANTs";
+  meta = {
     description = "Advanced normalization toolkit for medical image registration and other processing";
-    maintainers = with maintainers; [ bcdarwin ];
-    platforms = platforms.unix;
-    license = licenses.bsd3;
+    homepage = "https://github.com/ANTsX/ANTs";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ bcdarwin ];
+    platforms = lib.platforms.unix;
   };
 }

From d04a1a598e1a4113359c4b8cbaa806a65274e8be Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Sat, 2 Sep 2023 22:18:19 +0200
Subject: [PATCH 11/41] ants: use `finalAttrs` pattern

---
 pkgs/applications/science/biology/ants/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix
index dc0b16e9f4a6..16e20b6790e5 100644
--- a/pkgs/applications/science/biology/ants/default.nix
+++ b/pkgs/applications/science/biology/ants/default.nix
@@ -8,14 +8,14 @@
 , Cocoa
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ANTs";
   version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "ANTsX";
     repo = "ANTs";
-    rev = "refs/tags/v${version}";
+    rev = "refs/tags/v${finalAttrs.version}";
     hash = "sha256-rSibcsprhMC1qsuZN8ou32QPLf8n62BiDzpnTRWRx0Q=";
   };
 
@@ -49,4 +49,4 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ bcdarwin ];
     platforms = lib.platforms.unix;
   };
-}
+})

From ad1e8a5b434b8be9bf5a4db6680d7c2032676c98 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Sat, 2 Sep 2023 23:08:44 +0200
Subject: [PATCH 12/41] ants: update `meta` attributes

---
 pkgs/applications/science/biology/ants/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix
index 16e20b6790e5..b6c679178e77 100644
--- a/pkgs/applications/science/biology/ants/default.nix
+++ b/pkgs/applications/science/biology/ants/default.nix
@@ -43,9 +43,11 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = {
+    changelog = "https://github.com/ANTsX/ANTs/releases/tag/v${finalAttrs.version}";
     description = "Advanced normalization toolkit for medical image registration and other processing";
     homepage = "https://github.com/ANTsX/ANTs";
-    license = lib.licenses.bsd3;
+    license = lib.licenses.asl20;
+    mainProgram = "antsRegistration";
     maintainers = with lib.maintainers; [ bcdarwin ];
     platforms = lib.platforms.unix;
   };

From 55b00aa1f78a0bba81cd25f45b7819825f17260d Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Sat, 2 Sep 2023 23:09:28 +0200
Subject: [PATCH 13/41] ants: update `postInstall` attribute

---
 pkgs/applications/science/biology/ants/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/biology/ants/default.nix b/pkgs/applications/science/biology/ants/default.nix
index b6c679178e77..cb3ec8a4f7ed 100644
--- a/pkgs/applications/science/biology/ants/default.nix
+++ b/pkgs/applications/science/biology/ants/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   postInstall = ''
     for file in $out/bin/*; do
-      wrapProgram $file --set ANTSPATH "$out/bin"
+      wrapProgram $file --set PATH "$out/bin"
     done
   '';
 

From 8c2717b70182744fcadfeb221eae1c19bb395f12 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Mon, 28 Aug 2023 09:57:10 +0200
Subject: [PATCH 14/41] mcaselector: init at 2.2.2

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 .../games/minecraft/mcaselector/default.nix   | 41 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 +++
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/tools/games/minecraft/mcaselector/default.nix

diff --git a/pkgs/tools/games/minecraft/mcaselector/default.nix b/pkgs/tools/games/minecraft/mcaselector/default.nix
new file mode 100644
index 000000000000..0cf48dbe0b6b
--- /dev/null
+++ b/pkgs/tools/games/minecraft/mcaselector/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, stdenvNoCC
+, fetchurl
+, makeWrapper
+, jre
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "mcaselector";
+  version = "2.2.2";
+
+  src = fetchurl {
+    url = "https://github.com/Querz/mcaselector/releases/download/${finalAttrs.version}/mcaselector-${finalAttrs.version}.jar";
+    hash = "sha256-tOSdzLFxvEJ9LXliwfosMkgcrQLsrW7qDS8vrgPzQoI=";
+  };
+
+  dontUnpack = true;
+  dontBuild = true;
+
+  nativeBuildInputs = [ jre makeWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/{bin,lib/mcaselector}
+    cp $src $out/lib/mcaselector/mcaselector.jar
+    makeWrapper ${jre}/bin/java $out/bin/mcaselector \
+      --add-flags "-jar $out/lib/mcaselector/mcaselector.jar"
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/Querz/mcaselector";
+    description = "A tool to select chunks from Minecraft worlds for deletion or export";
+    sourceProvenance = with sourceTypes; [ binaryBytecode ];
+    license = licenses.mit;
+    maintainers = [ maintainers.Scrumplex ];
+    platforms = platforms.linux;
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index df11cbca064b..deed1aa12d03 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1858,6 +1858,12 @@ with pkgs;
 
   mbidled = callPackage ../tools/networking/mbidled { };
 
+  mcaselector = callPackage ../tools/games/minecraft/mcaselector {
+    jre = jre.override {
+      enableJavaFX = true;
+    };
+  };
+
   metapixel = callPackage ../tools/graphics/metapixel { };
 
   memos = callPackage ../servers/memos { };

From 64f4985b2f35851224f539b423c19ae4aec0c358 Mon Sep 17 00:00:00 2001
From: Noah Lidell <noahlidell@gmail.com>
Date: Sat, 2 Sep 2023 16:23:19 -0500
Subject: [PATCH 15/41] maintainers: add _21eleven

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 79cca0e7b090..b99333277213 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -132,6 +132,12 @@
     github = "13r0ck";
     githubId = 58987761;
   };
+  _21eleven = {
+    name = "Noah Lidell";
+    email = "noahlidell@gmail.com";
+    github = "21eleven";
+    githubId = 8813855;
+  };
   _2gn = {
     name = "Hiram Tanner";
     github = "2gn";

From edaa77ddd44278e29f369c5bde0e45e40ce5c71d Mon Sep 17 00:00:00 2001
From: Noah Lidell <noahlidell@gmail.com>
Date: Sat, 2 Sep 2023 16:37:58 -0500
Subject: [PATCH 16/41] azeret-mono: init at 1.0

---
 pkgs/data/fonts/azeret-mono/default.nix | 39 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/data/fonts/azeret-mono/default.nix

diff --git a/pkgs/data/fonts/azeret-mono/default.nix b/pkgs/data/fonts/azeret-mono/default.nix
new file mode 100644
index 000000000000..dfaf98c965d2
--- /dev/null
+++ b/pkgs/data/fonts/azeret-mono/default.nix
@@ -0,0 +1,39 @@
+{ lib, stdenvNoCC, fetchFromGitHub }:
+
+stdenvNoCC.mkDerivation {
+  pname = "azeret-mono";
+  version = "1.0";
+
+  src = fetchFromGitHub {
+    owner = "displaay";
+    repo = "Azeret";
+    rev = "3d45a6c3e094f08bfc70551b525bd2037cac51ba";
+    hash = "sha256-WC5a2O+/hdX+lLz81obcmq64wYpX48ZxsYPEaZUbFaY=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm644 fonts/ttf/*.ttf -t $out/share/fonts/truetype
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Azeret Mono";
+    longDescription = ''
+      The story of the typeface began with a draft that was driven by an exploration of OCR fonts, past and futuristic operating systems, various interfaces and the nineties. The final result is more based on a desire to achieve an appearance of the typeface that could serve in operating systems. Thus the overall character is a conjunction of everything described with details that evoke a specific personality.
+
+      Azeret is a sans-serif typeface with a mono-linear character. Don’t go looking for too much contrast in the strokes! The circular parts of the letters do not have a smooth connection to the stems. The x-height is higher than usual and thus the ascenders and descenders are short. Alternates are also available which open the possibility of creating different moods. A number of them hint at a nineties aesthetic.
+
+      The monospaced sub-family is available for free and is also on Google Fonts. If you would like to explore Azeret more you can do it on our micro-site which we developed with Martin Ehrlich.
+
+      Designer: Martin Vácha, Daniel Quisek
+      Production: Renegade Fonts (Jan Charvát, Zuzana Konečná)
+    '';
+    homepage = "https://displaay.net/typeface/azeret/azeret-mono/";
+    license = licenses.ofl;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ _21eleven ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 707bc0064fa3..af0c326d20e9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3353,6 +3353,8 @@ with pkgs;
 
   iam-policy-json-to-terraform = callPackage ../tools/misc/iam-policy-json-to-terraform { };
 
+  azeret-mono = callPackage ../data/fonts/azeret-mono { };
+
   azure-cli = callPackage ../tools/admin/azure-cli { };
 
   azure-functions-core-tools = callPackage ../development/tools/azure-functions-core-tools { };

From 9625107037dc9fade241db8bf3f72e08fabc0bce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Sep 2023 02:05:06 +0000
Subject: [PATCH 17/41] kubeshark: 41.6 -> 50.2

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

diff --git a/pkgs/applications/networking/cluster/kubeshark/default.nix b/pkgs/applications/networking/cluster/kubeshark/default.nix
index 76d8a0905af3..23f43688d5c9 100644
--- a/pkgs/applications/networking/cluster/kubeshark/default.nix
+++ b/pkgs/applications/networking/cluster/kubeshark/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "kubeshark";
-  version = "41.6";
+  version = "50.2";
 
   src = fetchFromGitHub {
     owner = "kubeshark";
     repo = "kubeshark";
     rev = version;
-    sha256 = "sha256-UFBht8H8iOHwMU8PM2FCb+oh7rTkN/XC3/W3EmuTp84=";
+    sha256 = "sha256-bABPfy790cMIfunKYfZwDbEn07fhq6g0m/yqeFgJg4Y=";
   };
 
   vendorHash = "sha256-rcxnvKkc9zerfULRdU5eGRRqSDQQDNMYaLJ7oEMQghk=";

From 529ad4a9a39c13e579e874b4f73e2969f79f47bb Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Sat, 2 Sep 2023 23:21:56 -0400
Subject: [PATCH 18/41] python3Packages.pandas: disable unreliable tests

test_rolling.py is unreliable on aarch64-darwin depending on the
compiler used and possibly optimization settings. Disabling these tests
allows clang 16 to build Pandas on Darwin successfully.

See https://github.com/pandas-dev/pandas/issues/38921.
---
 pkgs/development/python-modules/pandas/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/pandas/default.nix b/pkgs/development/python-modules/pandas/default.nix
index d79b9eea4bce..e64f61e0ddec 100644
--- a/pkgs/development/python-modules/pandas/default.nix
+++ b/pkgs/development/python-modules/pandas/default.nix
@@ -206,6 +206,8 @@ buildPythonPackage rec {
   ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [
     # tests/generic/test_finalize.py::test_binops[and_-args4-right] - AssertionError: assert {} == {'a': 1}
     "test_binops"
+    # These tests are unreliable on aarch64-darwin. See https://github.com/pandas-dev/pandas/issues/38921.
+    "test_rolling"
   ];
 
   # Tests have relative paths, and need to reference compiled C extensions

From 2fa06aa7b6842807bbf5e0061f1978671c705d58 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Sep 2023 06:18:26 +0000
Subject: [PATCH 19/41] python310Packages.globus-sdk: 3.27.0 -> 3.28.0

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

diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix
index e96d6dff8e42..f2aac17703a0 100644
--- a/pkgs/development/python-modules/globus-sdk/default.nix
+++ b/pkgs/development/python-modules/globus-sdk/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "globus-sdk";
-  version = "3.27.0";
+  version = "3.28.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "globus";
     repo = "globus-sdk-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-ZgRYwx/vICs1ombD8LGvCr0Wf9TpQurDGBoC2mtbxRs=";
+    hash = "sha256-mKtqfEpnWftpGReaUrmXf3LftZnMtEizPi4RbIwgnUM=";
   };
 
   propagatedBuildInputs = [

From fc0572f3b66aa059a04691198c603f45df94a457 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 3 Sep 2023 08:47:26 +0200
Subject: [PATCH 20/41] python311Packages.aiohomekit: 3.0.1 -> 3.0.2

Diff: https://github.com/Jc2k/aiohomekit/compare/refs/tags/3.0.1...3.0.2

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

diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix
index ed3823af9bef..e083abc1d7ea 100644
--- a/pkgs/development/python-modules/aiohomekit/default.nix
+++ b/pkgs/development/python-modules/aiohomekit/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "aiohomekit";
-  version = "3.0.1";
+  version = "3.0.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "Jc2k";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-TyVmvricfaS+i96DGwh0IKhMm56U1DyebAmRb+OFCh4=";
+    hash = "sha256-EE8+VoZ755wd8s3Gm0lziu+1r4rAFgdjEtqI0apoZ7E=";
   };
 
   nativeBuildInputs = [

From 297a154a667415359625f35e2926afda5d722445 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 3 Sep 2023 08:56:37 +0200
Subject: [PATCH 21/41] python311Packages.django-tastypie: 0.14.5 -> 0.14.6

Diff: https://github.com/django-tastypie/django-tastypie/compare/refs/tags/v0.14.5...v0.14.6

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

diff --git a/pkgs/development/python-modules/django-tastypie/default.nix b/pkgs/development/python-modules/django-tastypie/default.nix
index 8056aca7100e..004773037e88 100644
--- a/pkgs/development/python-modules/django-tastypie/default.nix
+++ b/pkgs/development/python-modules/django-tastypie/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "django-tastypie";
-  version = "0.14.5";
+  version = "0.14.6";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "django-tastypie";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-RgYinpo8eVzRaSkcnFkSq+IqpcFt6LCCHkpHyB/7u5M=";
+    hash = "sha256-emZVcycGLa8Z2yMv/NWZi1b5fPk50u841cFfFF3Ke/s=";
   };
 
   propagatedBuildInputs = [

From e89f998b90add0aea7d5251f4037f5c0a3c55edc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 3 Sep 2023 08:57:47 +0200
Subject: [PATCH 22/41] python311Packages.policy-sentry: 0.12.8 -> 0.12.9

Diff: https://github.com/salesforce/policy_sentry/compare/refs/tags/0.12.8...0.12.9

Changelog: https://github.com/salesforce/policy_sentry/releases/tag/0.12.9
---
 pkgs/development/python-modules/policy-sentry/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/policy-sentry/default.nix b/pkgs/development/python-modules/policy-sentry/default.nix
index 5915459f8ec9..e358143afea3 100644
--- a/pkgs/development/python-modules/policy-sentry/default.nix
+++ b/pkgs/development/python-modules/policy-sentry/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "policy-sentry";
-  version = "0.12.8";
+  version = "0.12.9";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "salesforce";
     repo = "policy_sentry";
     rev = "refs/tags/${version}";
-    hash = "sha256-I56xWBbE1TqP+I8Op5X4TqHNB+gRlEPi7YQldIsjv4Q=";
+    hash = "sha256-mVB7qqADjf4XnDaQyL5C4/Z6hOxAMQbmr6fGnaXD+O0=";
   };
 
   propagatedBuildInputs = [

From 2e822053bbc95450e244d440a50b0cecbf0cd3a7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 3 Sep 2023 08:58:22 +0200
Subject: [PATCH 23/41] python311Packages.pyschlage: 2023.8.1 -> 2023.9.0

Diff: https://github.com/dknowles2/pyschlage/compare/refs/tags/2023.8.1...2023.9.0

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

diff --git a/pkgs/development/python-modules/pyschlage/default.nix b/pkgs/development/python-modules/pyschlage/default.nix
index ff0d39fa7e32..45ba38aed42b 100644
--- a/pkgs/development/python-modules/pyschlage/default.nix
+++ b/pkgs/development/python-modules/pyschlage/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pyschlage";
-  version = "2023.8.1";
+  version = "2023.9.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "dknowles2";
     repo = "pyschlage";
     rev = "refs/tags/${version}";
-    hash = "sha256-PTkuVGUdqRcvgcIL7yoVWNLQcWyDpXXHLxb7CoD8J1s=";
+    hash = "sha256-4uYUEx6OcUMG8nS/PqZK5hHFQd/7pTGIix2it8pleuY=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From da18bd17b62ecca39b671e43ec66c00f7066277a Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Sun, 3 Sep 2023 09:01:47 +0200
Subject: [PATCH 24/41] gpxsee: fix compilation on `darwin`

---
 pkgs/applications/misc/gpxsee/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/misc/gpxsee/default.nix b/pkgs/applications/misc/gpxsee/default.nix
index 890714c8c9e0..42467e177ab2 100644
--- a/pkgs/applications/misc/gpxsee/default.nix
+++ b/pkgs/applications/misc/gpxsee/default.nix
@@ -7,7 +7,6 @@
 , qttools
 , qtlocation ? null # qt5 only
 , qtpositioning ? null # qt6 only
-, qtpbfimageplugin
 , qtserialport
 , qtsvg
 , qt5compat ? null # qt6 only
@@ -29,7 +28,6 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    qtpbfimageplugin
     qtserialport
   ] ++ (if isQt6 then [
     qtbase

From 151d0fbd8590c79543c76219332ab6116001a0fa Mon Sep 17 00:00:00 2001
From: kashw2 <supra4keanu@hotmail.com>
Date: Sun, 3 Sep 2023 17:13:35 +1000
Subject: [PATCH 25/41] aliyun-cli: 3.0.179 -> 3.0.180

---
 pkgs/tools/admin/aliyun-cli/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/aliyun-cli/default.nix b/pkgs/tools/admin/aliyun-cli/default.nix
index d237e4f748f9..ff38638d5bca 100644
--- a/pkgs/tools/admin/aliyun-cli/default.nix
+++ b/pkgs/tools/admin/aliyun-cli/default.nix
@@ -2,17 +2,17 @@
 
 buildGoModule rec {
   pname = "aliyun-cli";
-  version = "3.0.179";
+  version = "3.0.180";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "aliyun";
     repo = pname;
     fetchSubmodules = true;
-    sha256 = "sha256-AQsmk5Kl/uGUeT3hNEuqg28q+hXtkz3E7J2Q0FOdr8U=";
+    sha256 = "sha256-w1t1sx7Pcv444x3YPNSg3fRQdPga2Q9Z1+Iad7OTjOM=";
   };
 
-  vendorHash = "sha256-81z4bflVzDCl6IiYnTwFPsLHXq87OiKv4aDmZq05Nqc=";
+  vendorHash = "sha256-bL1S6GML7XuLraVXcd6NcC3VSYAd05F2ktzI0KF3G8A=";
 
   subPackages = [ "main" ];
 

From 9a5173311988d6ca91708742826c069bba007351 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 3 Sep 2023 07:17:31 +0000
Subject: [PATCH 26/41] python310Packages.libtmux: 0.23.0post0 -> 0.23.1

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

diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix
index ac07b77bf2b4..aab31436fb2b 100644
--- a/pkgs/development/python-modules/libtmux/default.nix
+++ b/pkgs/development/python-modules/libtmux/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "libtmux";
-  version = "0.23.0post0";
+  version = "0.23.1";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "tmux-python";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-qk9QYfLVJVtkNgAZ19UziU7metluz10gDs9HbMoqZjo=";
+    hash = "sha256-uMsQFDPLsphS6T55sDMKFawYgAycp8u9NizF5ZHnMqQ=";
   };
 
   postPatch = ''

From 5ca74285a23d51b367b0052830989506bc38bf5d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 27 Jun 2023 23:48:03 +0200
Subject: [PATCH 27/41] python311Packages.aws-sam-translator: add changelog to
 meta

---
 pkgs/development/python-modules/aws-sam-translator/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/aws-sam-translator/default.nix b/pkgs/development/python-modules/aws-sam-translator/default.nix
index 2a2915afcd75..f5af4ac77973 100644
--- a/pkgs/development/python-modules/aws-sam-translator/default.nix
+++ b/pkgs/development/python-modules/aws-sam-translator/default.nix
@@ -59,7 +59,8 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Python library to transform SAM templates into AWS CloudFormation templates";
-    homepage = "https://github.com/aws/serverless-application-model";
+    homepage = "https://github.com/awslabs/serverless-application-model";
+    changelog = "https://github.com/aws/serverless-application-model/releases/tag/v${version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ ];
   };

From dae9199acee75a52a3de526a5d3b12393b50151d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 27 Jun 2023 23:51:43 +0200
Subject: [PATCH 28/41] python311Packages.cfn-lint: 0.73.2 -> 0.77.10

Diff: https://github.com/aws-cloudformation/cfn-python-lint/compare/refs/tags/v0.73.2...0.77.10

Changelog: https://github.com/aws-cloudformation/cfn-lint/blob/v0.77.10/CHANGELOG.md
---
 .../python-modules/cfn-lint/default.nix       | 53 +++++++++----------
 1 file changed, 24 insertions(+), 29 deletions(-)

diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix
index 9c44a4f4b6b6..568a01a21999 100644
--- a/pkgs/development/python-modules/cfn-lint/default.nix
+++ b/pkgs/development/python-modules/cfn-lint/default.nix
@@ -1,38 +1,37 @@
 { lib
+, aws-sam-translator
 , buildPythonPackage
 , fetchFromGitHub
-, pythonOlder
-, aws-sam-translator
 , jschema-to-python
 , jsonpatch
 , jsonschema
 , junit-xml
-, networkx
-, pyyaml
-, sarif-om
-, setuptools
-, six
 , mock
+, networkx
 , pydot
 , pytestCheckHook
+, pythonOlder
+, pyyaml
+, regex
+, sarif-om
+, setuptools
+, sympy
 }:
 
 buildPythonPackage rec {
   pname = "cfn-lint";
-  version = "0.73.2";
+  version = "0.77.10";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "aws-cloudformation";
     repo = "cfn-python-lint";
     rev = "refs/tags/v${version}";
-    hash = "sha256-CNB5LrXllGxy99NjCrbjkUXUpJ72U3pUnWqrqkOiCG8=";
+    hash = "sha256-lIL+lwrQqD4mamf0xDwxpL4jTgQWSLzRM1nUgkSZgQA=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace "jsonschema~=3.0" "jsonschema>=3.0"
-  '';
-
   propagatedBuildInputs = [
     aws-sam-translator
     jschema-to-python
@@ -40,9 +39,11 @@ buildPythonPackage rec {
     jsonschema
     junit-xml
     networkx
+    networkx
     pyyaml
+    regex
     sarif-om
-    six
+    sympy
   ];
 
   nativeCheckInputs = [
@@ -62,34 +63,28 @@ buildPythonPackage rec {
     # https://github.com/aws-cloudformation/cfn-python-lint/issues/1705
     # See also: https://github.com/NixOS/nixpkgs/issues/108076
     "TestQuickStartTemplates"
-    # requires git directory
+    # Requires git directory
     "test_update_docs"
     # Tests depend on network access (fails in getaddrinfo)
     "test_update_resource_specs_python_2"
     "test_update_resource_specs_python_3"
     "test_sarif_formatter"
+    # Some CLI tests fails
+    "test_bad_config"
+    "test_override_parameters"
+    "test_positional_template_parameters"
+    "test_template_config"
   ];
 
   pythonImportsCheck = [
     "cfnlint"
-    "cfnlint.conditions"
-    "cfnlint.core"
-    "cfnlint.decode.node"
-    "cfnlint.decode.cfn_yaml"
-    "cfnlint.decode.cfn_json"
-    "cfnlint.decorators.refactored"
-    "cfnlint.graph"
-    "cfnlint.helpers"
-    "cfnlint.rules"
-    "cfnlint.runner"
-    "cfnlint.template"
-    "cfnlint.transform"
   ];
 
   meta = with lib; {
     description = "Checks cloudformation for practices and behaviour that could potentially be improved";
     homepage = "https://github.com/aws-cloudformation/cfn-python-lint";
-    changelog = "https://github.com/aws-cloudformation/cfn-python-lint/blob/master/CHANGELOG.md";
+    changelog = "https://github.com/aws-cloudformation/cfn-lint/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
+    maintainers = with maintainers; [ ];
   };
 }

From 34b88e57ee0d70ad23999616855e7001545ad646 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 7 Aug 2023 11:21:10 +0200
Subject: [PATCH 29/41] python311Packages.cfn-lint: 0.77.10 -> 0.79.6

Diff: https://github.com/aws-cloudformation/cfn-python-lint/compare/refs/tags/v0.77.10...v0.79.6

Changelog: https://github.com/aws-cloudformation/cfn-lint/blob/v0.79.6/CHANGELOG.md
---
 pkgs/development/python-modules/cfn-lint/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cfn-lint/default.nix b/pkgs/development/python-modules/cfn-lint/default.nix
index 568a01a21999..ed5377d9783a 100644
--- a/pkgs/development/python-modules/cfn-lint/default.nix
+++ b/pkgs/development/python-modules/cfn-lint/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "cfn-lint";
-  version = "0.77.10";
+  version = "0.79.6";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "aws-cloudformation";
     repo = "cfn-python-lint";
     rev = "refs/tags/v${version}";
-    hash = "sha256-lIL+lwrQqD4mamf0xDwxpL4jTgQWSLzRM1nUgkSZgQA=";
+    hash = "sha256-5Lb8dA8HqDdEO/Ehv5y/JlP+te46mzrTw/kNHBb9l38=";
   };
 
   propagatedBuildInputs = [

From e908e694160980205dc3d90f6b5d29d7dc70354a Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Sun, 3 Sep 2023 09:28:34 +0200
Subject: [PATCH 30/41] php81: 8.1.22 -> 8.1.23

---
 pkgs/development/interpreters/php/8.1.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix
index c05ac442ced6..d5548087f3cd 100644
--- a/pkgs/development/interpreters/php/8.1.nix
+++ b/pkgs/development/interpreters/php/8.1.nix
@@ -2,8 +2,8 @@
 
 let
   base = callPackage ./generic.nix (_args // {
-    version = "8.1.22";
-    hash = "sha256-mSNU44LGxhjQHtS+Br7qjewxeLFBU99k08jEi4Xp+8I=";
+    version = "8.1.23";
+    hash = "sha256-kppieFF32okt3/ygdLqy8f9XhHOg1K25FcEvXz407Bs=";
   });
 
 in

From 0bd0eda4d725fb20b92e598dd2a5f321ae6a23cb Mon Sep 17 00:00:00 2001
From: kashw2 <supra4keanu@hotmail.com>
Date: Sun, 3 Sep 2023 17:28:45 +1000
Subject: [PATCH 31/41] stripe-cli: 1.17.1 -> 1.17.2

---
 pkgs/tools/admin/stripe-cli/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/stripe-cli/default.nix b/pkgs/tools/admin/stripe-cli/default.nix
index 727f6f605cbe..45fdbff60321 100644
--- a/pkgs/tools/admin/stripe-cli/default.nix
+++ b/pkgs/tools/admin/stripe-cli/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "stripe-cli";
-  version = "1.17.1";
+  version = "1.17.2";
 
   src = fetchFromGitHub {
     owner = "stripe";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-5j2DHbBLHQWtkQP8qTTxD949alo5mh88Vgv5cus8C/w=";
+    hash = "sha256-MzzjrGtqbtZMvfL7dPAsKHF2ZTneSdtDuwHQQcyrQDw=";
   };
   vendorHash = "sha256-DYA6cu2KzEBZ4wsT7wjcdY1endQQOZlj2aOwu6iGLew=";
 
@@ -72,7 +72,7 @@ buildGoModule rec {
       Create, retrieve, update, or delete API objects.
     '';
     license = with licenses; [ asl20 ];
-    maintainers = with maintainers; [ RaghavSood jk ];
+    maintainers = with maintainers; [ RaghavSood jk kashw2 ];
     mainProgram = "stripe";
   };
 }

From 913dbe6f3c7b48360d7af87f4b55e03b69495300 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Sun, 3 Sep 2023 09:29:24 +0200
Subject: [PATCH 32/41] php82: 8.2.9 -> 8.2.10

---
 pkgs/development/interpreters/php/8.2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix
index d80269d4ae7d..f5f553c5eba9 100644
--- a/pkgs/development/interpreters/php/8.2.nix
+++ b/pkgs/development/interpreters/php/8.2.nix
@@ -2,8 +2,8 @@
 
 let
   base = callPackage ./generic.nix (_args // {
-    version = "8.2.9";
-    hash = "sha256-SEYLmUrn61CWoxD0TRPoZd4XcRBNSlUNUwcr5YpvF2w=";
+    version = "8.2.10";
+    hash = "sha256-zJg06PG2E9dneviEPDZR6YKavKjr/pB5JR0Nhdmgqj4=";
   });
 
 in

From 9a835ab1107ece165e6040d58d9a57e403225001 Mon Sep 17 00:00:00 2001
From: kashw2 <supra4keanu@hotmail.com>
Date: Sun, 3 Sep 2023 17:42:32 +1000
Subject: [PATCH 33/41] qovery-cli: 0.67.1 -> 0.68.0

---
 pkgs/tools/admin/qovery-cli/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix
index 9c88c2d39b89..60e4140597fe 100644
--- a/pkgs/tools/admin/qovery-cli/default.nix
+++ b/pkgs/tools/admin/qovery-cli/default.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "qovery-cli";
-  version = "0.67.1";
+  version = "0.68.0";
 
   src = fetchFromGitHub {
     owner = "Qovery";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-mVn+Q4XZ+jJjHR+V5Rl/rPUZN/Tv7vVX7u6IDuJNdO0=";
+    hash = "sha256-iurfG1g1I7ufraBLkbLATyM3SPfO5RhVF3k6SjExWUI=";
   };
 
-  vendorHash = "sha256-Fcm/f54zGgA742yhIVJxjv7Y2T8DblC71+hw5HTmOf0=";
+  vendorHash = "sha256-U/yV+6WV8Oc0gLcYFyfOeBzzJdNwyyBk3jPRkH3LUrc=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From b49a7ff31032fd0981f5ecdb18a65f28f5062404 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 3 Sep 2023 09:43:03 +0200
Subject: [PATCH 34/41] python311Packages.recordlinkage: add changelog to meta

---
 .../python-modules/recordlinkage/default.nix          | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/recordlinkage/default.nix b/pkgs/development/python-modules/recordlinkage/default.nix
index 8c911b282605..5a4deadb25db 100644
--- a/pkgs/development/python-modules/recordlinkage/default.nix
+++ b/pkgs/development/python-modules/recordlinkage/default.nix
@@ -41,14 +41,19 @@ buildPythonPackage rec {
 
   # pytestCheckHook does not work
   # Reusing their CI setup which involves 'rm -rf recordlinkage' in preCheck phase do not work too.
-  nativeCheckInputs = [ pytest ];
+  nativeCheckInputs = [
+    pytest
+  ];
 
-  pythonImportsCheck = [ "recordlinkage" ];
+  pythonImportsCheck = [
+    "recordlinkage"
+  ];
 
   meta = with lib; {
     description = "Library to link records in or between data sources";
     homepage = "https://recordlinkage.readthedocs.io/";
+    changelog = "https://github.com/J535D165/recordlinkage/releases/tag/v${version}";
     license = licenses.bsd3;
-    maintainers = [ maintainers.raitobezarius ];
+    maintainers = with maintainers; [ raitobezarius ];
   };
 }

From c846af67f1f292b6a26f047d40f479ccf0f4d20f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 3 Sep 2023 09:49:06 +0200
Subject: [PATCH 35/41] python311Packages.recordlinkage: add nativeBuildInputs

---
 .../python-modules/recordlinkage/default.nix           | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/recordlinkage/default.nix b/pkgs/development/python-modules/recordlinkage/default.nix
index 5a4deadb25db..4d8ab8e8a8c9 100644
--- a/pkgs/development/python-modules/recordlinkage/default.nix
+++ b/pkgs/development/python-modules/recordlinkage/default.nix
@@ -10,9 +10,11 @@
 , pandas
 , pyarrow
 , pytest
+, pythonOlder
 , scikit-learn
 , scipy
-, pythonOlder
+, setuptools
+, setuptools-scm
 }:
 
 buildPythonPackage rec {
@@ -21,11 +23,17 @@ buildPythonPackage rec {
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
+
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-7NoMEN/xOLFwaBXeMysShfZwrn6MzpJZYhNQHVieaqQ=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+    setuptools-scm
+  ];
+
   propagatedBuildInputs = [
     pyarrow
     jellyfish

From 2adb0afae14436fba89e054b27a8eece5da1c83e Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 3 Sep 2023 07:54:40 +0000
Subject: [PATCH 36/41] xfce.thunar: 4.18.6 -> 4.18.7

https://gitlab.xfce.org/xfce/thunar/-/compare/thunar-4.18.6...thunar-4.18.7
---
 pkgs/desktops/xfce/core/thunar/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/xfce/core/thunar/default.nix b/pkgs/desktops/xfce/core/thunar/default.nix
index 0d80c6bd451e..b0f8a02f6d7e 100644
--- a/pkgs/desktops/xfce/core/thunar/default.nix
+++ b/pkgs/desktops/xfce/core/thunar/default.nix
@@ -21,9 +21,9 @@
 let unwrapped = mkXfceDerivation {
   category = "xfce";
   pname = "thunar";
-  version = "4.18.6";
+  version = "4.18.7";
 
-  sha256 = "sha256-7SWpIBGm/YhnQSWYi5BgYjx8WCiEqxZRTagz/cY0p3E=";
+  sha256 = "sha256-pxIblhC40X0wdE6+uvmV5ypp4sOZtzn/evcS33PlNpU=";
 
   nativeBuildInputs = [
     docbook_xsl

From eae6b20c8b7cf5303585f1f5af2cbc5c68a23aa1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 3 Sep 2023 10:00:25 +0200
Subject: [PATCH 37/41] python310Packages.globus-sdk: update disabled

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

diff --git a/pkgs/development/python-modules/globus-sdk/default.nix b/pkgs/development/python-modules/globus-sdk/default.nix
index f2aac17703a0..76bd9c572fa4 100644
--- a/pkgs/development/python-modules/globus-sdk/default.nix
+++ b/pkgs/development/python-modules/globus-sdk/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
   version = "3.28.0";
   format = "setuptools";
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "globus";

From d560a5e07dc4125ef116f1806f447e59e1642b45 Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Sun, 27 Aug 2023 22:46:41 +0200
Subject: [PATCH 38/41] nixos/update-users-groups: fix cross compilation

Since #246772, cross compiled NixOS is broken because the DateTime perl
package that was used in the update-users-groups.pl script depends on
Testutf8 which does not cross compile (see #198548).

This PR drops the DateTime dependency in favour of TimePiece, which has
less dependencies and whose closure does cross compile.
---
 nixos/modules/config/update-users-groups.pl | 15 +++------------
 nixos/modules/config/users-groups.nix       |  2 +-
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/nixos/modules/config/update-users-groups.pl b/nixos/modules/config/update-users-groups.pl
index 5236264e16b7..3785ba8c5fb8 100644
--- a/nixos/modules/config/update-users-groups.pl
+++ b/nixos/modules/config/update-users-groups.pl
@@ -4,7 +4,7 @@ use File::Path qw(make_path);
 use File::Slurp;
 use Getopt::Long;
 use JSON;
-use DateTime;
+use Time::Piece;
 
 # Keep track of deleted uids and gids.
 my $uidMapFile = "/var/lib/nixos/uid-map";
@@ -26,17 +26,8 @@ sub updateFile {
 # Converts an ISO date to number of days since 1970-01-01
 sub dateToDays {
     my ($date) = @_;
-    my ($year, $month, $day) = split('-', $date, -3);
-    my $dt = DateTime->new(
-        year      => $year,
-        month     => $month,
-        day       => $day,
-        hour      => 0,
-        minute    => 0,
-        second    => 0,
-        time_zone => 'UTC',
-    );
-    return $dt->epoch / 86400;
+    my $time = Time::Piece->strptime($date, "%Y-%m-%d");
+    return $time->epoch / 60 / 60 / 24;
 }
 
 sub nscdInvalidate {
diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 9629e3964c96..9c2ead47c925 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -648,7 +648,7 @@ in {
         install -m 0700 -d /root
         install -m 0755 -d /home
 
-        ${pkgs.perl.withPackages (p: [ p.FileSlurp p.JSON p.DateTime ])}/bin/perl \
+        ${pkgs.perl.withPackages (p: [ p.FileSlurp p.JSON p.TimePiece ])}/bin/perl \
         -w ${./update-users-groups.pl} ${spec}
       '';
     };

From 76f8cf18d19ca79cc740c9b380197bb1245f91ce Mon Sep 17 00:00:00 2001
From: Ramses <ramses@well-founded.dev>
Date: Mon, 28 Aug 2023 13:22:24 +0300
Subject: [PATCH 39/41] nixos/update-users-groups: no need to include extra
 package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com>
---
 nixos/modules/config/users-groups.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 9c2ead47c925..684b4bc8fbcc 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -648,7 +648,7 @@ in {
         install -m 0700 -d /root
         install -m 0755 -d /home
 
-        ${pkgs.perl.withPackages (p: [ p.FileSlurp p.JSON p.TimePiece ])}/bin/perl \
+        ${pkgs.perl.withPackages (p: [ p.FileSlurp p.JSON ])}/bin/perl \
         -w ${./update-users-groups.pl} ${spec}
       '';
     };

From f3171ea8bc7a26a096d0d0e67cdab76a55ba438c Mon Sep 17 00:00:00 2001
From: Aaron Jheng <wentworth@outlook.com>
Date: Sun, 3 Sep 2023 18:02:32 +0800
Subject: [PATCH 40/41] lazytools: use sri hash

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

diff --git a/pkgs/tools/security/sshchecker/default.nix b/pkgs/tools/security/sshchecker/default.nix
index 5dfc37dcf6cf..6ed76d0dd4e2 100644
--- a/pkgs/tools/security/sshchecker/default.nix
+++ b/pkgs/tools/security/sshchecker/default.nix
@@ -11,10 +11,10 @@ buildGoModule rec {
     owner = "lazytools";
     repo = pname;
     rev = "v${version}";
-    sha256 = "139b850h1w0392k8jcgj22jscsl2l60b5kk0n8378b6g57ikmis0";
+    hash = "sha256-QMc64ynPLHQGsmDOsoChgmqmpRDyMYmmSAPwAEFBK40=";
   };
 
-  vendorSha256 = "19hdaf7d6lvwrl5rc1srrjsjx57g25cy4lvw0vvs6j52impdk6ak";
+  vendorHash = "sha256-U5nZbo2iSKP3BnxT4lkR75QutcxZB5YLzXxT045TDaY=";
 
   meta = with lib; {
     description = "Dedicated SSH brute-forcing tool";

From 0ab1e26024712f497ef8f46a38dbc321223847b2 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 17 Aug 2023 17:58:57 +0800
Subject: [PATCH 41/41] spidermonkey_115: init at 115.2.0

Based on https://src.fedoraproject.org/rpms/mozjs115.

* js/src/configure.in is gone.
* build/cargo-linker is ported to python.
---
 pkgs/development/interpreters/spidermonkey/115.nix    | 4 ++++
 pkgs/development/interpreters/spidermonkey/common.nix | 4 ++++
 pkgs/top-level/all-packages.nix                       | 3 +++
 3 files changed, 11 insertions(+)
 create mode 100644 pkgs/development/interpreters/spidermonkey/115.nix

diff --git a/pkgs/development/interpreters/spidermonkey/115.nix b/pkgs/development/interpreters/spidermonkey/115.nix
new file mode 100644
index 000000000000..433a16f5da2e
--- /dev/null
+++ b/pkgs/development/interpreters/spidermonkey/115.nix
@@ -0,0 +1,4 @@
+import ./common.nix {
+  version = "115.2.0";
+  hash = "sha512-3ztO/ZYH6OtJMnF3YMhl6zGsepYkbLQ4UZDDMxbJWV4Hk6HzxF67lnSpuk/OmNg/cbBjvvCe8wfZLRzXjTDYEg==";
+}
diff --git a/pkgs/development/interpreters/spidermonkey/common.nix b/pkgs/development/interpreters/spidermonkey/common.nix
index 244a699fd54b..5beac058eb90 100644
--- a/pkgs/development/interpreters/spidermonkey/common.nix
+++ b/pkgs/development/interpreters/spidermonkey/common.nix
@@ -157,10 +157,13 @@ stdenv.mkDerivation (finalAttrs: rec {
     export AS=$CC
     export AC_MACRODIR=$PWD/build/autoconf/
 
+  '' + lib.optionalString (lib.versionAtLeast version "91" && lib.versionOlder version "115") ''
     pushd js/src
     sh ../../build/autoconf/autoconf.sh --localdir=$PWD configure.in > configure
     chmod +x configure
     popd
+  '' + lib.optionalString (lib.versionAtLeast version "115") ''
+    patchShebangs build/cargo-linker
   '' + ''
     # We can't build in js/src/, so create a build dir
     mkdir obj
@@ -184,6 +187,7 @@ stdenv.mkDerivation (finalAttrs: rec {
     homepage = "https://spidermonkey.dev/";
     license = licenses.mpl20; # TODO: MPL/GPL/LGPL tri-license for 78.
     maintainers = with maintainers; [ abbradar lostnet catap ];
+    broken = stdenv.isDarwin && versionAtLeast version "115"; # Requires SDK 13.3 (see #242666).
     platforms = platforms.unix;
   };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e23480a1a37..edd41602e613 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -18235,6 +18235,9 @@ with pkgs;
   spidermonkey_102 = callPackage ../development/interpreters/spidermonkey/102.nix {
     inherit (darwin) libobjc;
   };
+  spidermonkey_115 = callPackage ../development/interpreters/spidermonkey/115.nix {
+    inherit (darwin) libobjc;
+  };
 
   ssm-agent = callPackage ../applications/networking/cluster/ssm-agent { };
   ssm-session-manager-plugin = callPackage ../applications/networking/cluster/ssm-session-manager-plugin { };