From c596592e731fd1775b08d16dd6a5d254123b4b80 Mon Sep 17 00:00:00 2001
From: Cnly <minecnly@gmail.com>
Date: Wed, 4 Sep 2024 01:33:03 +0800
Subject: [PATCH 01/34] nixos-rebuild: add --no-ssh-tty flag

---
 .../os-specific/linux/nixos-rebuild/_nixos-rebuild |  1 +
 .../linux/nixos-rebuild/nixos-rebuild.8            | 11 +++++++++++
 .../linux/nixos-rebuild/nixos-rebuild.sh           | 14 ++++++++++++--
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/nixos-rebuild/_nixos-rebuild b/pkgs/os-specific/linux/nixos-rebuild/_nixos-rebuild
index 84e8d223bd80..31e23136528d 100644
--- a/pkgs/os-specific/linux/nixos-rebuild/_nixos-rebuild
+++ b/pkgs/os-specific/linux/nixos-rebuild/_nixos-rebuild
@@ -36,6 +36,7 @@ _nixos-rebuild() {
     --rollback
     --specialisation -c # name
     --use-remote-sudo
+    --no-ssh-tty
     --build-host # host
     --target-host # host
     # Used with list-generations
diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8 b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8
index 9ef46b564dda..25ae9efba1c7 100644
--- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8
+++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.8
@@ -37,6 +37,7 @@
 .Op Fl -build-host Va host
 .Op Fl -target-host Va host
 .Op Fl -use-remote-sudo
+.Op Fl -no-ssh-tty
 .br
 .Op Fl -verbose | v
 .Op Fl -quiet
@@ -392,6 +393,16 @@ system with
 .Ic sudo Ns
 \&. Setting this option allows deploying as a non-root user.
 .
+.It Fl -no-ssh-tty
+When set, nixos-rebuild will not request a tty when executing commands on the
+.Fl -target-host
+system with
+.Ic ssh Ns
+\&. This may help avoid corrupted terminal output when running multiple
+nixos-rebuild commands in parallel, but may also prevent the remote
+.Ic sudo
+from working properly.
+.
 .It Fl -file Ar path , Fl f Ar path
 Enable and build the NixOS system from the specified file. The file must
 evaluate to an attribute set, and it must contain a valid NixOS configuration
diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
index 54e9e92bb292..76d0c0bc09ff 100755
--- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
+++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh
@@ -32,6 +32,7 @@ specialisation=
 buildHost=
 targetHost=
 remoteSudo=
+noSSHTTY=
 verboseScript=
 noFlake=
 attr=
@@ -152,6 +153,9 @@ while [ "$#" -gt 0 ]; do
       --use-remote-sudo)
         remoteSudo=1
         ;;
+      --no-ssh-tty)
+        noSSHTTY=1
+        ;;
       --flake)
         flake="$1"
         shift 1
@@ -227,12 +231,18 @@ targetHostCmd() {
 }
 
 targetHostSudoCmd() {
+    local t=
+    if [[ ! "${noSSHTTY:-x}" = 1 ]]; then
+        t="-t"
+    fi
+
     if [ -n "$remoteSudo" ]; then
-        useSudo=1 SSHOPTS="$SSHOPTS -t" targetHostCmd "$@"
+        useSudo=1 SSHOPTS="$SSHOPTS $t" targetHostCmd "$@"
     else
         # While a tty might not be necessary, we apply it to be consistent with
         # sudo usage, and an experience that is more consistent with local deployment.
-        SSHOPTS="$SSHOPTS -t" targetHostCmd "$@"
+        # But if the user really doesn't want it, don't do it.
+        SSHOPTS="$SSHOPTS $t" targetHostCmd "$@"
     fi
 }
 

From c0a7814de8b9be9a6a263f33716ce957cf955c50 Mon Sep 17 00:00:00 2001
From: Daniel Fahey <daniel.fahey@pm.me>
Date: Thu, 10 Oct 2024 17:56:12 +0100
Subject: [PATCH 02/34] linuxKernel.kernels.linux_zen: 6.10.9-zen1 ->
 6.11.2-zen1

---
 pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index 9b1dbc3c9bbe..66157f6689cb 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -5,9 +5,9 @@ let
   variants = {
     # ./update-zen.py zen
     zen = {
-      version = "6.10.9"; #zen
+      version = "6.11.2"; #zen
       suffix = "zen1"; #zen
-      sha256 = "199362jd1waqri6arb8sdfqrzjkdki5vis2z03cpp2blnbqva10b"; #zen
+      sha256 = "1pwhdx8dcih0q3xj2hndd9vmz1xclrp4dw9yk0p1hi03mb634s40"; #zen
       isLqx = false;
     };
     # ./update-zen.py lqx

From 8fd84a5c85dbec4f3b4f2072a287f7a959129a26 Mon Sep 17 00:00:00 2001
From: Daniel Fahey <daniel.fahey@pm.me>
Date: Thu, 10 Oct 2024 20:00:46 +0100
Subject: [PATCH 03/34] linuxKernel.kernels.linux_lqx: 6.10.9-lqx1 ->
 6.11.2-lqx1

---
 pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index 66157f6689cb..afca9bb2a44e 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -12,9 +12,9 @@ let
     };
     # ./update-zen.py lqx
     lqx = {
-      version = "6.10.9"; #lqx
+      version = "6.11.2"; #lqx
       suffix = "lqx1"; #lqx
-      sha256 = "0y7r55iy7ylddv7yrlwkz7ps82j447a6m3khq2w4sfh8f0xy86p7"; #lqx
+      sha256 = "0q5zdzb26azshn1n8fc5zy5n2sa7sz3q4khkjivafz6pyli1wfl8"; #lqx
       isLqx = true;
     };
   };

From 65806d881ac0cbf62a72f959b2c366201dac8875 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 13 Oct 2024 16:57:37 +0200
Subject: [PATCH 04/34] python312Packages.pymdown-extensions: 10.8.1 -> 10.11.2

Diff: facelessuser/pymdown-extensions@refs/tags/10.8.1...10.11.2
---
 .../python-modules/pymdown-extensions/default.nix | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/pymdown-extensions/default.nix b/pkgs/development/python-modules/pymdown-extensions/default.nix
index 627d5ad562dc..38774edd1971 100644
--- a/pkgs/development/python-modules/pymdown-extensions/default.nix
+++ b/pkgs/development/python-modules/pymdown-extensions/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch2,
   hatchling,
   pytestCheckHook,
   markdown,
@@ -46,24 +45,16 @@ let
 in
 buildPythonPackage rec {
   pname = "pymdown-extensions";
-  version = "10.8.1";
+  version = "10.11.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "facelessuser";
     repo = "pymdown-extensions";
     rev = "refs/tags/${version}";
-    hash = "sha256-No0RDBgr40xSOiKXQRLRZnMdV+5i4eM8Jwp7c2Jw/ZY=";
+    hash = "sha256-1AuN2kp7L6w8RvKky3IoX4ht9uQL6o2nm6dTDo/INC0=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      name = "pymdown-extensions-pygments-compat.patch";
-      url = "https://github.com/facelessuser/pymdown-extensions/commit/f1e2fad862c9738e420b8451dfdfbd9e90e849fc.patch";
-      hash = "sha256-ENYTRXBJ76VPhhab8MdOh+bkcQNRklXT3thvPi+gHIY=";
-    })
-  ];
-
   build-system = [ hatchling ];
 
   dependencies = [
@@ -79,6 +70,8 @@ buildPythonPackage rec {
   disabledTests = [
     # test artifact mismatch
     "test_toc_tokens"
+    # Tests fails with AssertionError
+    "test_windows_root_conversion"
   ];
 
   pythonImportsCheck = map (ext: "pymdownx.${ext}") extensions;

From 24b8bee3a5f4eb4bf4ed5ae3aedc5a0b13600e3e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 13 Oct 2024 16:58:12 +0200
Subject: [PATCH 05/34] python312Packages.mkdocstrings-python: 1.11.1 -> 1.12.0

Changelog: https://github.com/mkdocstrings/python/blob/1.12.0/CHANGELOG.md
---
 .../python-modules/mkdocstrings-python/default.nix       | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mkdocstrings-python/default.nix b/pkgs/development/python-modules/mkdocstrings-python/default.nix
index 1b741ff73315..47b9e1bf4e67 100644
--- a/pkgs/development/python-modules/mkdocstrings-python/default.nix
+++ b/pkgs/development/python-modules/mkdocstrings-python/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "mkdocstrings-python";
-  version = "1.11.1";
+  version = "1.12.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "mkdocstrings";
     repo = "python";
     rev = "refs/tags/${version}";
-    hash = "sha256-g6F6xIFKLzNqgbWGZXdJeoqQz/GIlC3XmrG9Kjkr1rU=";
+    hash = "sha256-Dwh1MQuOjN/quxKlOMIadZ5MR8BrS/s6l4mwSBTfXQE=";
   };
 
   build-system = [ pdm-backend ];
@@ -38,6 +38,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "mkdocstrings_handlers" ];
 
+  disabledTests = [
+    # Tests fails with AssertionError
+    "test_windows_root_conversion"
+  ];
+
   meta = with lib; {
     description = "Python handler for mkdocstrings";
     homepage = "https://github.com/mkdocstrings/python";

From d67e7033326d0a6e91381de2c93347a6d4e69888 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 13 Oct 2024 21:55:14 +0200
Subject: [PATCH 06/34] python312Packages.griffe: 1.3.2 -> 1.4.1

Diff: https://github.com/mkdocstrings/griffe/compare/refs/tags/1.3.2...1.4.1

Changelog: https://github.com/mkdocstrings/griffe/blob/1.4.1/CHANGELOG.md
---
 pkgs/development/python-modules/griffe/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/griffe/default.nix b/pkgs/development/python-modules/griffe/default.nix
index 6bc84c1e5677..208f6a7c827b 100644
--- a/pkgs/development/python-modules/griffe/default.nix
+++ b/pkgs/development/python-modules/griffe/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "griffe";
-  version = "1.3.2";
+  version = "1.4.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "mkdocstrings";
     repo = "griffe";
     rev = "refs/tags/${version}";
-    hash = "sha256-IDIacG1FM/JidHV76PGTaPnkIfulAli8+YLuiuPHdZ8=";
+    hash = "sha256-DgfoaRvgU4WWbCirbLld8f/C2bPrW576aX0HglaRjEU=";
   };
 
   build-system = [ pdm-backend ];

From 9ad49fbbf7b7b6705d83b3db9d49ae5dd924d7f8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 13 Oct 2024 21:59:12 +0200
Subject: [PATCH 07/34] python312Packages.aggdraw: 1.3.18 -> 1.3.19

Diff: https://github.com/pytroll/aggdraw/compare/v1.3.18...v1.3.19
---
 pkgs/development/python-modules/aggdraw/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aggdraw/default.nix b/pkgs/development/python-modules/aggdraw/default.nix
index 06e092b4a605..5eaa52f72676 100644
--- a/pkgs/development/python-modules/aggdraw/default.nix
+++ b/pkgs/development/python-modules/aggdraw/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "aggdraw";
-  version = "1.3.18";
+  version = "1.3.19";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "pytroll";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-dM6yLR6xsZerpqY+BMxIjrJ3fQty9CFUWhxl2zkTgRA=";
+    hash = "sha256-J9+mxlUxOoRBFdz+p8me2T93jaov5rNvKbAZ2YX/VhA=";
   };
 
   nativeBuildInputs = [

From dfc608194a16e6648772c8d77be964aa0bc508a9 Mon Sep 17 00:00:00 2001
From: Isidor Zeuner <nix@quidecco.pl>
Date: Sat, 12 Oct 2024 22:53:05 +0200
Subject: [PATCH 08/34] python3Packages.spacy: use cython 0.29.37 to fix
 compile error

---
 pkgs/top-level/python-packages.nix | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 32b58b06c195..7337774d7bcd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14606,7 +14606,18 @@ self: super: with self; {
     libsoxr = pkgs.soxr;
   };
 
-  spacy = callPackage ../development/python-modules/spacy { };
+  spacy = callPackage ../development/python-modules/spacy {
+    # fix error: ‘_PyCFrame’ has no member named ‘use_tracing’
+    # see: https://aur.archlinux.org/packages/python-spacy
+    cython_0 = cython_0.overridePythonAttrs (old: rec {
+      version = "0.29.37";
+      src = pkgs.fetchPypi {
+        pname = "Cython";
+        inherit version;
+        hash = "sha256-+BPUpt2Ure5dT/JmGR0dlb9tQWSk+sxTVCLAIbJQTPs=";
+      };
+    });
+  };
 
   spacy-alignments = callPackage ../development/python-modules/spacy-alignments { };
 

From 1932f502892d03e7b4a2373606b63c923c249e28 Mon Sep 17 00:00:00 2001
From: Pierre Roux <pierre.roux@onera.fr>
Date: Mon, 14 Oct 2024 14:03:57 +0200
Subject: [PATCH 09/34] Fixing coqPackages_8_19.coq-elpi

Was missing the elpi version
---
 pkgs/development/coq-modules/coq-elpi/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/coq-modules/coq-elpi/default.nix b/pkgs/development/coq-modules/coq-elpi/default.nix
index c9db564c1941..eacafcbe3809 100644
--- a/pkgs/development/coq-modules/coq-elpi/default.nix
+++ b/pkgs/development/coq-modules/coq-elpi/default.nix
@@ -10,6 +10,7 @@ let
     { case = "8.16"; out = { version = "1.17.0"; };}
     { case = "8.17"; out = { version = "1.17.0"; };}
     { case = "8.18"; out = { version = "1.18.1"; };}
+    { case = "8.19"; out = { version = "1.18.1"; };}
     { case = "8.20"; out = { version = "1.19.2"; };}
   ] {} );
 in (mkCoqDerivation {

From 320c35c793f494a8bfbe9633d777a3f6a043cf1b Mon Sep 17 00:00:00 2001
From: Pierre Roux <pierre.roux@onera.fr>
Date: Mon, 14 Oct 2024 13:26:05 +0200
Subject: [PATCH 10/34] coqPackages.parsec: 0.1.2 -> 0.2.0

---
 pkgs/development/coq-modules/parsec/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/coq-modules/parsec/default.nix b/pkgs/development/coq-modules/parsec/default.nix
index 9b5d827eecd5..292e7e369b61 100644
--- a/pkgs/development/coq-modules/parsec/default.nix
+++ b/pkgs/development/coq-modules/parsec/default.nix
@@ -11,14 +11,18 @@ mkCoqDerivation {
 
   inherit version;
   defaultVersion = with lib.versions; lib.switch coq.version [
+    { case = range "8.14" "8.20"; out = "0.2.0"; }
     { case = range "8.14" "8.20"; out = "0.1.2"; }
     { case = range "8.12" "8.16"; out = "0.1.1"; }
     { case = range "8.12" "8.13"; out = "0.1.0"; }
   ] null;
+  release."0.2.0".sha256 = "sha256-hM6LVFQ2VQ42QeHu8Ex+oz1VvJUr+g8/nZN+bYHEljQ=";
   release."0.1.2".sha256 = "sha256-QN0h1CsX86DQBDsluXLtNUvMh3r60/0iDSbYam67AhA=";
   release."0.1.1".sha256 = "sha256:1c0l18s68pzd4c8i3jimh2yz0pqm4g38pca4bm7fr18r8xmqf189";
   release."0.1.0".sha256 = "sha256:01avfcqirz2b9wjzi9iywbhz9szybpnnj3672dgkfsimyg9jgnsr";
 
+  useDuneifVersion = v: lib.versions.isGe "0.2.0" v || v == "dev";
+
   meta = with lib; {
     description = "Library for serialization to S-expressions";
     license = licenses.bsd3;

From e7e63c3f79859f8b664cb2db790f64bc0a2caea3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 14 Oct 2024 12:22:11 +0000
Subject: [PATCH 11/34] gnome-network-displays: 0.92.2 -> 0.93.0

---
 .../networking/gnome-network-displays/default.nix             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/gnome-network-displays/default.nix b/pkgs/applications/networking/gnome-network-displays/default.nix
index 819e26b1a4c6..a8ae96e12e23 100644
--- a/pkgs/applications/networking/gnome-network-displays/default.nix
+++ b/pkgs/applications/networking/gnome-network-displays/default.nix
@@ -27,11 +27,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnome-network-displays";
-  version = "0.92.2";
+  version = "0.93.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gnome-network-displays/${lib.versions.majorMinor finalAttrs.version}/gnome-network-displays-${finalAttrs.version}.tar.xz";
-    sha256 = "sha256-df35UJnRolVSiYcArpnrglxNKbTKA3LAGsNwlDF7cj4=";
+    sha256 = "sha256-xxvR8zR+Yglo0e9HRrSFPbgEriYpcRN5K0SXg/D0Oo4=";
   };
 
   nativeBuildInputs = [

From 0231e3b87721952176049a747b9b4d3c5e716428 Mon Sep 17 00:00:00 2001
From: Pierre Roux <pierre.roux@onera.fr>
Date: Mon, 14 Oct 2024 13:38:05 +0200
Subject: [PATCH 12/34] coqPackages.json: 0.1.3 -> 0.2.0

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

diff --git a/pkgs/development/coq-modules/json/default.nix b/pkgs/development/coq-modules/json/default.nix
index 6638c8b211db..f30c238aafd0 100644
--- a/pkgs/development/coq-modules/json/default.nix
+++ b/pkgs/development/coq-modules/json/default.nix
@@ -1,6 +1,6 @@
 { lib, mkCoqDerivation, coq, parsec, MenhirLib, version ? null }:
 
-mkCoqDerivation {
+(mkCoqDerivation {
   pname = "json";
   owner = "liyishuai";
   repo = "coq-json";
@@ -8,19 +8,23 @@ mkCoqDerivation {
 
   defaultVersion = let inherit (lib.versions) range; in
     lib.switch coq.coq-version [
+      { case = range "8.14" "8.20"; out = "0.2.0"; }
       { case = range "8.14" "8.20"; out = "0.1.3"; }
     ] null;
   release = {
+    "0.2.0".sha256  = "sha256-qDRTgWLUvu4x3/d3BDcqo2I4W5ZmLyRiwuY/Tm/FuKA=";
     "0.1.3".sha256  = "sha256-lElAzW4IuX+BB6ngDjlyKn0MytLRfbhQanB+Lct/WR0=";
   };
   releaseRev = v: "v${v}";
 
   propagatedBuildInputs = [ parsec MenhirLib coq.ocamlPackages.menhir ];
 
-  buildFlags = [ "MENHIRFLAGS=--coq" "MENHIRFLAGS+=--coq-no-version-check" ];
+  useDuneifVersion = v: lib.versions.isGe "0.2.0" v || v == "dev";
 
   meta = {
     description = "From JSON to Coq, and vice versa.";
     license = lib.licenses.bsd3;
   };
-}
+}).overrideAttrs (o: lib.optionalAttrs (o.version != null
+    && lib.versions.isLt "0.2.0" o.version)
+  { buildFlags = [ "MENHIRFLAGS=--coq" "MENHIRFLAGS+=--coq-no-version-check" ]; })

From 31ca06ca583b19c7e84c322489fca7c53f98a89d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 14 Oct 2024 13:52:23 +0000
Subject: [PATCH 13/34] wxmaxima: 24.05.0 -> 24.08.0

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

diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix
index 2a6225eab765..d529b7e0ea3c 100644
--- a/pkgs/applications/science/math/wxmaxima/default.nix
+++ b/pkgs/applications/science/math/wxmaxima/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs:{
   pname = "wxmaxima";
-  version = "24.05.0";
+  version = "24.08.0";
 
   src = fetchFromGitHub {
     owner = "wxMaxima-developers";
     repo = "wxmaxima";
     rev = "Version-${finalAttrs.version}";
-    hash = "sha256-pl3sO28HANL9F41aaJznxUsH2Y7W/FO82Rik2/ik2Ag=";
+    hash = "sha256-W9sZlCPi+pz37OQoICnRGQR2hoe/UciMN6NIzDgHNPQ=";
   };
 
   buildInputs = [

From f4b8e76a5b72e698314389070dfff157e592cecb Mon Sep 17 00:00:00 2001
From: scraptux <git@thomasjasny.de>
Date: Mon, 14 Oct 2024 22:34:09 +0200
Subject: [PATCH 14/34] vscode-extensions.sas.sas-lsp: 1.10.2 -> 1.11.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 3f83b004c8c6..811e6b989fb1 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4174,8 +4174,8 @@ let
         mktplcRef = {
           name = "sas-lsp";
           publisher = "SAS";
-          version = "1.10.2";
-          hash = "sha256-mf0q80UX4FxqHAHJBQlhkF/nqvTnfgTR8GuYBoWSswU=";
+          version = "1.11.0";
+          hash = "sha256-CJn5pSZB+f5Eo7DvkJbP0iEzBbuBQC3FSZwxbxlrq58=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/SAS.sas-lsp/changelog";

From 59689a6aebbda37ca606557c95356348fb29d28e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 14 Oct 2024 23:19:29 +0200
Subject: [PATCH 15/34] nuclei-templates: 10.0.1 -> 10.0.2

Diff: https://github.com/projectdiscovery/nuclei-templates/compare/refs/tags/v10.0.1...v10.0.2

Changelog: https://github.com/projectdiscovery/nuclei-templates/releases/tag/v10.0.2
---
 pkgs/by-name/nu/nuclei-templates/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix
index 196abb001faa..c630d8ae1f65 100644
--- a/pkgs/by-name/nu/nuclei-templates/package.nix
+++ b/pkgs/by-name/nu/nuclei-templates/package.nix
@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "nuclei-templates";
-  version = "10.0.1";
+  version = "10.0.2";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "nuclei-templates";
     rev = "refs/tags/v${version}";
-    hash = "sha256-unQ/c3S1uJGSE7DoDsKnnI0n7YGe7s8F0g+yUNB4xH4=";
+    hash = "sha256-mFuY1i+AqksAvaMAJkP227eZZE+sauRxOIqV5DO8MFE=";
   };
 
   installPhase = ''

From 6cb97244c85c44d53ff6c1348580d0d314a0476c Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Mon, 14 Oct 2024 23:29:26 +0200
Subject: [PATCH 16/34] signal-desktop: 7.27.0 -> 7.28.0

https://github.com/signalapp/Signal-Desktop/releases/tag/v7.28.0
---
 .../instant-messengers/signal-desktop/signal-desktop.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix
index 0cc920d5f43f..e3ae4a54a968 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix
@@ -2,7 +2,7 @@
 callPackage ./generic.nix { } rec {
   pname = "signal-desktop";
   dir = "Signal";
-  version = "7.27.0";
+  version = "7.28.0";
   url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-  hash = "sha256-Ff/hRoanAVlaAu5ofZ6oy4ULifk3O0HiQK0Z8Wd1H1g=";
+  hash = "sha256-ZBnEIQvx3FLp1aoAKHDpNBptl9jK/z69OyAWLfk2fDw=";
 }

From df0c496ad298860a42617ce8e35ac6085f4c0d04 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Mon, 14 Oct 2024 23:30:06 +0200
Subject: [PATCH 17/34] signal-desktop-beta: 7.25.0-beta.2 -> 7.29.0-beta.1

---
 .../instant-messengers/signal-desktop/signal-desktop-beta.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix
index f557734764cd..7b9396330a10 100644
--- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix
+++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix
@@ -2,7 +2,7 @@
 callPackage ./generic.nix { } rec {
   pname = "signal-desktop-beta";
   dir = "Signal Beta";
-  version = "7.25.0-beta.2";
+  version = "7.29.0-beta.1";
   url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb";
-  hash = "sha256-7L+ldJYJXB9VkC12s8AyUdECVXnyN8PNo7AFIyEHcS8=";
+  hash = "sha256-+IfCdwoDgHgqOKS7QAca0P3ULw8EE40asqJvj2zWWPA=";
 }

From e89e9ac3c686fd1cf32cb5f78121ce5f33e9d69a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 14 Oct 2024 23:39:53 +0200
Subject: [PATCH 18/34] sqlfluff: 3.2.3 -> 3.2.4

Diff: https://github.com/sqlfluff/sqlfluff/compare/refs/tags/3.2.3...3.2.4

Changelog: https://github.com/sqlfluff/sqlfluff/blob/3.2.4/CHANGELOG.md
---
 pkgs/development/tools/database/sqlfluff/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/database/sqlfluff/default.nix b/pkgs/development/tools/database/sqlfluff/default.nix
index c9d6f1913a62..c68e1e00fc6f 100644
--- a/pkgs/development/tools/database/sqlfluff/default.nix
+++ b/pkgs/development/tools/database/sqlfluff/default.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "sqlfluff";
-  version = "3.2.3";
+  version = "3.2.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sqlfluff";
     repo = "sqlfluff";
     rev = "refs/tags/${version}";
-    hash = "sha256-Ebk2oa4mv48pSzOyDxOddltIiyXpUZ+mt+VkDpbW1LM=";
+    hash = "sha256-7EP2XIbvdB3oCFTY6IS9r00/QEB/eHJth05hVBzZCUI=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];

From 8dcea608309f107ddf40e9ee0367f2de8d7b21b1 Mon Sep 17 00:00:00 2001
From: jfvillablanca <31008330+jfvillablanca@users.noreply.github.com>
Date: Tue, 15 Oct 2024 06:38:27 +0800
Subject: [PATCH 19/34] pythonPackages.nbxmpp: 5.0.3 -> 5.0.4

https://dev.gajim.org/gajim/python-nbxmpp/-/compare/5.0.3...5.0.4
---
 pkgs/development/python-modules/nbxmpp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nbxmpp/default.nix b/pkgs/development/python-modules/nbxmpp/default.nix
index 07baf52739fd..b11d97f30ec9 100644
--- a/pkgs/development/python-modules/nbxmpp/default.nix
+++ b/pkgs/development/python-modules/nbxmpp/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "nbxmpp";
-  version = "5.0.3";
+  version = "5.0.4";
   format = "pyproject";
 
   disabled = pythonOlder "3.10";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "gajim";
     repo = "python-nbxmpp";
     rev = "refs/tags/${version}";
-    hash = "sha256-p7BRUf0YECI8xW3GVOCXHKtKs/4MFKUZR3k1XmTKMZI=";
+    hash = "sha256-5UFhR5WYxHJSRk2G5ik1IuNW1ra/IHoU/LNqiA95R94=";
   };
 
   nativeBuildInputs = [

From 83358204ce82e9f9116369ca351b3e0fcebe5367 Mon Sep 17 00:00:00 2001
From: jfvillablanca <31008330+jfvillablanca@users.noreply.github.com>
Date: Tue, 15 Oct 2024 06:44:43 +0800
Subject: [PATCH 20/34] gajim: 1.9.3 -> 1.9.5

https://dev.gajim.org/gajim/gajim/-/compare/1.9.3...1.9.5
---
 .../networking/instant-messengers/gajim/default.nix  | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index 8436a518d6d8..1772fb7a9cd7 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -21,11 +21,11 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "gajim";
-  version = "1.9.3";
+  version = "1.9.5";
 
   src = fetchurl {
     url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz";
-    hash = "sha256-TxWyUDoBvscKa2ogPrFlzLC2q+5RMyMnAiOpQdpFP4M=";
+    hash = "sha256-f99NsOsWp+vGecI2DxRfZOCrz/DxaRPEX5LI642HVjw=";
   };
 
   format = "pyproject";
@@ -60,14 +60,6 @@ python3.pkgs.buildPythonApplication rec {
 
   nativeCheckInputs = [ xvfb-run dbus ];
 
-  preBuild = ''
-    python pep517build/build_metadata.py -o dist/metadata
-  '';
-
-  postInstall = ''
-    python pep517build/install_metadata.py dist/metadata --prefix=$out
-  '';
-
   checkPhase = ''
     xvfb-run dbus-run-session \
       --config-file=${dbus}/share/dbus-1/session.conf \

From b3e8f9ca1da2b82938e61bf5898401606f0c31be Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 15 Oct 2024 05:27:24 +0000
Subject: [PATCH 21/34] wiringpi: 3.6 -> 3.10

---
 pkgs/os-specific/linux/wiringpi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/wiringpi/default.nix b/pkgs/os-specific/linux/wiringpi/default.nix
index a8eb74217a4f..57d72b67bcbf 100644
--- a/pkgs/os-specific/linux/wiringpi/default.nix
+++ b/pkgs/os-specific/linux/wiringpi/default.nix
@@ -7,12 +7,12 @@
 }:
 
 let
-  version = "3.6";
+  version = "3.10";
   srcAll = fetchFromGitHub {
     owner = "WiringPi";
     repo = "WiringPi";
     rev = version;
-    sha256 = "sha256-Hw81Ua9LTb/9l3Js1rx8TfCOF59MrrvH6AGsAsG1SoE=";
+    sha256 = "sha256-OWR+yo+SnYaMd8J+ku9ettZi+rDHcHlGZCoucCiRkCI=";
   };
   mkSubProject =
     {

From ca57a4c4658d55a169d53b130141ba7659aa5d89 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 15 Oct 2024 07:57:46 +0200
Subject: [PATCH 22/34] python312Packages.timm: 1.0.9 -> 1.0.10

Diff: https://github.com/huggingface/pytorch-image-models/compare/refs/tags/v1.0.9...v1.0.10

Changelog: https://github.com/huggingface/pytorch-image-models/blob/v1.0.10/README.md#whats-new
---
 pkgs/development/python-modules/timm/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/timm/default.nix b/pkgs/development/python-modules/timm/default.nix
index afee885b5446..c32343039a3c 100644
--- a/pkgs/development/python-modules/timm/default.nix
+++ b/pkgs/development/python-modules/timm/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
 
   # build-system
@@ -22,16 +21,14 @@
 
 buildPythonPackage rec {
   pname = "timm";
-  version = "1.0.9";
+  version = "1.0.10";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "pytorch-image-models";
     rev = "refs/tags/v${version}";
-    hash = "sha256-iWZXile3hCUMx2q3VHJasX7rlJmT0OKBm9rkCXuWISw=";
+    hash = "sha256-lZLP3rcKAMX6BzkSA7yuZNXMcp4jJ6FVKgSrOQHN6Ho=";
   };
 
   build-system = [ pdm-backend ];

From da6072514625d81c1a79f95a3377c25d8e73a2c6 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 14 Oct 2024 21:17:40 +0200
Subject: [PATCH 23/34] zed-editor: 0.156.1 -> 0.156.2

Diff: https://github.com/zed-industries/zed/compare/refs/tags/v0.156.1...0.156.2

Changelog: https://github.com/zed-industries/zed/releases/tag/v0.156.2
---
 pkgs/by-name/ze/zed-editor/Cargo.lock  | 2 +-
 pkgs/by-name/ze/zed-editor/package.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ze/zed-editor/Cargo.lock b/pkgs/by-name/ze/zed-editor/Cargo.lock
index 446a1b96b34f..3bbfe89d91ad 100644
--- a/pkgs/by-name/ze/zed-editor/Cargo.lock
+++ b/pkgs/by-name/ze/zed-editor/Cargo.lock
@@ -14398,7 +14398,7 @@ dependencies = [
 
 [[package]]
 name = "zed"
-version = "0.156.1"
+version = "0.156.2"
 dependencies = [
  "activity_indicator",
  "anyhow",
diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index 186e1b0e40a0..f765d0de34d9 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -86,13 +86,13 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "zed-editor";
-  version = "0.156.1";
+  version = "0.156.2";
 
   src = fetchFromGitHub {
     owner = "zed-industries";
     repo = "zed";
     rev = "refs/tags/v${version}";
-    hash = "sha256-cu+XcFJ6VAP+7fqVhptnjDNpRkq/lRmJBCNkiy5Mka8=";
+    hash = "sha256-nZsc8BUxHIVZoJvY+6JFIyuLJrnQ4H7LhesnEnceA74=";
     fetchSubmodules = true;
   };
 

From 8574a14dd82a7669253dcff86d94c40b1204a8e3 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 11 Oct 2024 22:00:23 +0100
Subject: [PATCH 24/34] python3{11,12}Packages.mhcflurry: remove nose
 dependency

This package is currently broken anyway, but I have sent an untested
PR upstream to migrate their tests to pytest in the hopes that it
will be merged by the time we can build this again. If we fix the
package before the PR is merged, hopefully we can use it as a basis
for a vendored patch.
---
 pkgs/development/python-modules/mhcflurry/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/mhcflurry/default.nix b/pkgs/development/python-modules/mhcflurry/default.nix
index b33e95fbdf8a..0f646113ec4d 100644
--- a/pkgs/development/python-modules/mhcflurry/default.nix
+++ b/pkgs/development/python-modules/mhcflurry/default.nix
@@ -44,8 +44,9 @@ buildPythonPackage rec {
     tqdm
   ];
 
+  # Tests currently depend on nose; see
+  # <https://github.com/openvax/mhcflurry/pull/244>.
   nativeCheckInputs = [
-    nose
     pytestCheckHook
   ];
 

From 764d8eaa80fbffba9746c674e37f168563ce4096 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 15 Oct 2024 09:55:57 +0300
Subject: [PATCH 25/34] telegram-desktop: 5.6.1-unstable-2024-10-12 -> 5.6.2

Diff: https://github.com/telegramdesktop/tdesktop/compare/f2e0e481de5d379b9542f6ff9021fab5d409c1d4...v5.6.2

Changelog: https://github.com/telegramdesktop/tdesktop/releases/tag/v5.6.2
---
 .../instant-messengers/telegram/telegram-desktop/default.nix    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
index 0c64345b1f44..8798a69f8bc6 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/default.nix
@@ -63,7 +63,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "telegram-desktop";
-  version = "5.6.1-unstable-2024-10-12";
+  version = "5.6.2";
 
   src = fetchFromGitHub {
     owner = "telegramdesktop";

From 447d4686a327ea3aadff3c00b944104786b29edf Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 15 Oct 2024 09:56:20 +0300
Subject: [PATCH 26/34] home-assistant-custom-components.yassi: 0.4.0 -> 0.4.1

Diff: https://github.com/samuelspagl/ha_samsung_soundbar/compare/0.4.0...0.4.1

Changelog: https://github.com/samuelspagl/ha_samsung_soundbar/releases/tag/0.4.1
---
 .../home-assistant/custom-components/yassi/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/yassi/default.nix b/pkgs/servers/home-assistant/custom-components/yassi/default.nix
index 39d8cd5145b5..3e69dc6ae8bb 100644
--- a/pkgs/servers/home-assistant/custom-components/yassi/default.nix
+++ b/pkgs/servers/home-assistant/custom-components/yassi/default.nix
@@ -7,13 +7,13 @@
 buildHomeAssistantComponent rec {
   owner = "samuelspagl";
   domain = "samsung_soundbar";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "ha_samsung_soundbar";
     rev = version;
-    hash = "sha256-pkwkXI05zDMEXPoE90YJBxoPYlzmSHH/BLExq0J1JrQ=";
+    hash = "sha256-uhyUQebAx4g1PT/urbyx8EZNFE9vIY0bUAKmgCwY3aQ=";
   };
 
   propagatedBuildInputs = [ pysmartthings ];

From 459c32e47ea9506113ae61c4a35a45f8a830dba1 Mon Sep 17 00:00:00 2001
From: 4ever2 <3417013+4ever2@users.noreply.github.com>
Date: Sun, 13 Oct 2024 15:15:28 +0200
Subject: [PATCH 27/34] coqPackages.RustExtraction: init at 0.1.0

---
 .../coq-modules/RustExtraction/default.nix    | 57 +++++++++++++++++++
 pkgs/top-level/coq-packages.nix               |  1 +
 2 files changed, 58 insertions(+)
 create mode 100644 pkgs/development/coq-modules/RustExtraction/default.nix

diff --git a/pkgs/development/coq-modules/RustExtraction/default.nix b/pkgs/development/coq-modules/RustExtraction/default.nix
new file mode 100644
index 000000000000..4aaa96e77f85
--- /dev/null
+++ b/pkgs/development/coq-modules/RustExtraction/default.nix
@@ -0,0 +1,57 @@
+{
+  lib,
+  mkCoqDerivation,
+  which,
+  coq,
+  metacoq,
+  version ? null,
+}:
+
+with lib;
+mkCoqDerivation {
+  pname = "RustExtraction";
+  repo = "coq-rust-extraction";
+  owner = "AU-COBRA";
+  domain = "github.com";
+
+  inherit version;
+  defaultVersion =
+    with versions;
+    switch
+      [
+        coq.coq-version
+        metacoq.version
+      ]
+      [
+        {
+          cases = [
+            (range "8.17" "8.19")
+            (range "1.3.1" "1.3.2")
+          ];
+          out = "0.1.0";
+        }
+      ]
+      null;
+
+  release."0.1.0".sha256 = "+Of/DP2Vjsa7ASKswjlvqqhcmDhC9WrozridedNZQkY=";
+
+  releaseRev = v: "v${v}";
+
+  propagatedBuildInputs = [
+    coq.ocamlPackages.findlib
+    metacoq
+  ];
+
+  postPatch = ''
+    patchShebangs ./process_extraction.sh
+    patchShebangs ./tests/process-extraction-examples.sh
+  '';
+
+  mlPlugin = true;
+
+  meta = {
+    description = "A framework for extracting Coq programs to Rust";
+    maintainers = with maintainers; [ _4ever2 ];
+    license = licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index 792a26d97313..e4c1daf1a9df 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -126,6 +126,7 @@ let
       reglang = callPackage ../development/coq-modules/reglang {};
       relation-algebra = callPackage ../development/coq-modules/relation-algebra {};
       rewriter = callPackage ../development/coq-modules/rewriter {};
+      RustExtraction = callPackage ../development/coq-modules/RustExtraction {};
       semantics = callPackage ../development/coq-modules/semantics {};
       serapi = callPackage ../development/coq-modules/serapi {};
       simple-io = callPackage ../development/coq-modules/simple-io { };

From b13432edec928c78fe4f383afa748dd092c5ad91 Mon Sep 17 00:00:00 2001
From: Patka <patka@patka.dev>
Date: Fri, 11 Oct 2024 15:47:47 +0200
Subject: [PATCH 28/34] snipe-it: 7.0.12 -> 7.0.13

---
 pkgs/by-name/sn/snipe-it/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/sn/snipe-it/package.nix b/pkgs/by-name/sn/snipe-it/package.nix
index da38ec7f5887..db98a777775b 100644
--- a/pkgs/by-name/sn/snipe-it/package.nix
+++ b/pkgs/by-name/sn/snipe-it/package.nix
@@ -6,18 +6,18 @@
 , php
 }:
 
-php.buildComposerProject (finalAttrs: {
+php.buildComposerProject2 (finalAttrs: {
   pname = "snipe-it";
-  version = "7.0.12";
+  version = "7.0.13";
 
   src = fetchFromGitHub {
     owner = "snipe";
     repo = "snipe-it";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-CTOhnGDmvxcQrS7VPsMeap6aD9YajSZ/C25RcRbL65w=";
+    hash = "sha256-LfE45ConH8/NPOhD+uDwJP3nNf040QEGZDdHAg1qwXg=";
   };
 
-  vendorHash = "sha256-8YZD6Q1Mb5VUGL/KQnYTtXKL3aziPfAmwvVthDdyBYY=";
+  vendorHash = "sha256-4csHTqhkTJBzoe0Vfc7Gu1qaDG3ixj6vPMYoVLIWUV0=";
 
   postInstall = ''
     snipe_it_out="$out/share/php/snipe-it"
@@ -36,7 +36,7 @@ php.buildComposerProject (finalAttrs: {
 
     chmod +x $snipe_it_out/artisan
 
-    substituteInPlace $snipe_it_out/config/database.php --replace "env('DB_DUMP_PATH', '/usr/local/bin')" "env('DB_DUMP_PATH', '${mariadb}/bin')"
+    substituteInPlace $snipe_it_out/config/database.php --replace-fail "env('DB_DUMP_PATH', '/usr/local/bin')" "env('DB_DUMP_PATH', '${mariadb}/bin')"
   '';
 
   passthru = {

From 209b7f634b4acef930ac39acc146dc0c4c4b04f3 Mon Sep 17 00:00:00 2001
From: Yaya <github@uwu.is>
Date: Mon, 14 Oct 2024 13:49:14 +0200
Subject: [PATCH 29/34] nixosTests.snipe-it: fix test

---
 nixos/tests/web-apps/snipe-it.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/web-apps/snipe-it.nix b/nixos/tests/web-apps/snipe-it.nix
index 123d7742056b..b04bd516831c 100644
--- a/nixos/tests/web-apps/snipe-it.nix
+++ b/nixos/tests/web-apps/snipe-it.nix
@@ -65,7 +65,9 @@ in {
     with subtest("Circumvent the pre-flight setup by just writing some settings into the database ourself"):
         snipeit.succeed(
             """
-            mysql -D ${nodes.snipeit.services.snipe-it.database.name} -e "INSERT INTO settings (id, user_id, site_name) VALUES ('1', '1', '${siteName}');"
+            mysql -D ${nodes.snipeit.services.snipe-it.database.name} -e "
+            INSERT INTO settings (id, site_name, login_remote_user_custom_logout_url, login_remote_user_header_name)
+            VALUES ('1', '${siteName}', 'https://whatever.invalid', 'whatever');"
             """
         )
 

From cb76eb37554a42a8f4b01aa36763eeafc9669ad6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 15 Oct 2024 07:28:16 +0000
Subject: [PATCH 30/34] asymptote: 2.90 -> 2.92

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

diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix
index ba0dd70254b3..d2fb26e3e336 100644
--- a/pkgs/tools/graphics/asymptote/default.nix
+++ b/pkgs/tools/graphics/asymptote/default.nix
@@ -10,14 +10,14 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "2.90";
+  version = "2.92";
   pname = "asymptote";
 
   outputs = [ "out" "man" "info" "doc" "tex" ];
 
   src = fetchurl {
     url = "mirror://sourceforge/asymptote/${finalAttrs.version}/asymptote-${finalAttrs.version}.src.tgz";
-    hash = "sha256-jGlW+4CL9EqPJJcpW0+muumMQYkrQPPuj8dYqSRwc0A=";
+    hash = "sha256-nZtcb6fg+848HlT+sl4tUdKMT+d5jyTHbNyugpGo6mY=";
   };
 
   # override with TeX Live containers to avoid building sty, docs from source

From b713071a827ebeeea6df50175ffdd170adb4b1f1 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 15 Oct 2024 08:36:50 +0100
Subject: [PATCH 31/34] python3{11,12}Packages.mhcflurry: remove unused nose
 input

Fixes: 8574a14dd82a7669253dcff86d94c40b1204a8e3
---
 pkgs/development/python-modules/mhcflurry/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/python-modules/mhcflurry/default.nix b/pkgs/development/python-modules/mhcflurry/default.nix
index 0f646113ec4d..e27c94704edc 100644
--- a/pkgs/development/python-modules/mhcflurry/default.nix
+++ b/pkgs/development/python-modules/mhcflurry/default.nix
@@ -15,7 +15,6 @@
   tqdm,
 
   # tests
-  nose,
   pytestCheckHook,
 }:
 

From 940d545355d5e79859502334f2fe269c3996046b Mon Sep 17 00:00:00 2001
From: Julius Michaelis <gitter@liftm.de>
Date: Mon, 14 Oct 2024 22:08:05 +0900
Subject: [PATCH 32/34] qemu-user: fix build under musl

---
 pkgs/applications/virtualization/qemu/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 619cc9daeba6..c5f1191605d9 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -144,6 +144,16 @@ stdenv.mkDerivation (finalAttrs: {
       sha256 = "sha256-oC+bRjEHixv1QEFO9XAm4HHOwoiT+NkhknKGPydnZ5E=";
       revert = true;
     })
+
+    # musl changes https://gitlab.com/qemu-project/qemu/-/issues/2215
+    (fetchpatch {
+      url = "https://gitlab.com/qemu-project/qemu/-/commit/ac1bbe8ca46c550b3ad99c85744119a3ace7b4f4.diff";
+      sha256 = "sha256-wSlf8+7WHk2Z4I5cLFa37MRroQucPIuFzzyWnG9IpeY=";
+    })
+    (fetchpatch {
+      url = "https://gitlab.com/qemu-project/qemu/-/commit/99174ce39e86ec6aea7bb7ce326b16e3eed9e3da.diff";
+      sha256 = "sha256-Cpt01d1ARoCTuJuC66no4doPgL+4/ZqnJTWwjU2MxnY=";
+    })
   ]
   ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch;
 

From 002b8bbd65d3b8bc6ef874967a0b25c51c02692f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 15 Oct 2024 07:45:36 +0000
Subject: [PATCH 33/34] reactphysics3d: 0.10.1 -> 0.10.2

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

diff --git a/pkgs/by-name/re/reactphysics3d/package.nix b/pkgs/by-name/re/reactphysics3d/package.nix
index 6f0a98d159bf..9ed933cf5e52 100644
--- a/pkgs/by-name/re/reactphysics3d/package.nix
+++ b/pkgs/by-name/re/reactphysics3d/package.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "reactphysics3d";
-  version = "0.10.1";
+  version = "0.10.2";
 
   src = fetchFromGitHub {
     owner = "DanielChappuis";
     repo = "reactphysics3d";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-j57wzqAmBV/pK7PPUDXV6ciOCQVs2gX+BaGHk4kLuUI=";
+    hash = "sha256-ZwV3mh/onlHPHeT6tky2CpawLZxEikY6hq4FVn6i5hI=";
   };
 
   nativeBuildInputs = [ cmake ];

From 9f1d63f8d46b7ed89f3b6c0ea41777735a030eef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= <git@viraptor.info>
Date: Tue, 15 Oct 2024 18:48:24 +1100
Subject: [PATCH 34/34] cmtk: darwin

Fix the Darwin build. It required the same c++ standard setting as other platforms.
Moved the options to cmake format too.
---
 pkgs/applications/science/biology/cmtk/default.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/science/biology/cmtk/default.nix b/pkgs/applications/science/biology/cmtk/default.nix
index 1263f8194c9f..531f9047ba2b 100644
--- a/pkgs/applications/science/biology/cmtk/default.nix
+++ b/pkgs/applications/science/biology/cmtk/default.nix
@@ -18,6 +18,12 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-iE164NCOSOypZLLZfZy9RTyrS+YnY9ECqfb4QhlsMS4=";
   };
 
+  postPatch = ''
+    substituteInPlace apps/vtkxform.cxx --replace-fail \
+      "float xyzFloat[3] = { xyz[0], xyz[1], xyz[2] };" \
+      "float xyzFloat[3] = { (float)xyz[0], (float)xyz[1], (float)xyz[2] };"
+  '';
+
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [
@@ -28,10 +34,10 @@ stdenv.mkDerivation (finalAttrs: {
     llvmPackages.openmp
   ];
 
-  env.NIX_CFLAGS_COMPILE = toString [
-    (lib.optionalString stdenv.cc.isGNU "-std=c++11")
-    (lib.optionalString stdenv.cc.isClang "-Wno-error=c++11-narrowing")
-    (lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) "-Dfinite=isfinite")
+  cmakeFlags = [
+    (lib.cmakeFeature "CMAKE_CXX_STANDARD" "14")
+  ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-Dfinite=isfinite")
   ];
 
   meta = with lib; {