From 9c0df8127788454f49e3641e724842efc40cf194 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Sep 2024 09:53:58 +0000
Subject: [PATCH 01/48] level-zero: 1.17.28 -> 1.17.42

---
 pkgs/development/libraries/level-zero/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/level-zero/default.nix b/pkgs/development/libraries/level-zero/default.nix
index 4bf0a9d3f94a..8b87f0af9f9b 100644
--- a/pkgs/development/libraries/level-zero/default.nix
+++ b/pkgs/development/libraries/level-zero/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "level-zero";
-  version = "1.17.28";
+  version = "1.17.42";
 
   src = fetchFromGitHub {
     owner = "oneapi-src";
     repo = "level-zero";
     rev = "refs/tags/v${version}";
-    hash = "sha256-rgQ7B3RZemlcurEQ8bwvlvJAypzHTOBqpowasziZCiQ=";
+    hash = "sha256-IjYRzjC7CUPDdVBVoWSZtUQaY7QtSfS/Nej/2BdVziY=";
   };
 
   nativeBuildInputs = [ cmake addDriverRunpath ];

From ab0db3f40d023ae59dcc9ce056a288128708cc5f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Sep 2024 07:23:54 +0000
Subject: [PATCH 02/48] llama-cpp: 3672 -> 3772

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

diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix
index 3b943a83cb65..6659122880e8 100644
--- a/pkgs/by-name/ll/llama-cpp/package.nix
+++ b/pkgs/by-name/ll/llama-cpp/package.nix
@@ -69,13 +69,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "llama-cpp";
-  version = "3672";
+  version = "3772";
 
   src = fetchFromGitHub {
     owner = "ggerganov";
     repo = "llama.cpp";
     rev = "refs/tags/b${finalAttrs.version}";
-    hash = "sha256-m9mMmvIasoJkj0DAx/6TLdt5Qflbe1JqaU1VQ/8bEG0=";
+    hash = "sha256-gJFCFhppaXs/9GReEjEZiU/BZ51pjl7IBsUN04uTls0=";
     leaveDotGit = true;
     postFetch = ''
       git -C "$out" rev-parse --short HEAD > $out/COMMIT

From 0a7b133937771556fc330bf7fb2c2d8d52f01ae2 Mon Sep 17 00:00:00 2001
From: Vladyslav Pekker <agilesteel@gmail.com>
Date: Tue, 17 Sep 2024 18:07:29 -0300
Subject: [PATCH 03/48] bloop: 2.0.0 -> 2.0.2 and aarch64-apple-darwin support

---
 .../development/tools/build-managers/bloop/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/build-managers/bloop/default.nix b/pkgs/development/tools/build-managers/bloop/default.nix
index 5a97ad797f91..01308d89050c 100644
--- a/pkgs/development/tools/build-managers/bloop/default.nix
+++ b/pkgs/development/tools/build-managers/bloop/default.nix
@@ -10,11 +10,12 @@
 
 stdenv.mkDerivation rec {
   pname = "bloop";
-  version = "2.0.0";
+  version = "2.0.2";
 
   platform =
     if stdenv.isLinux && stdenv.isx86_64 then "x86_64-pc-linux"
     else if stdenv.isDarwin && stdenv.isx86_64 then "x86_64-apple-darwin"
+    else if stdenv.isDarwin && stdenv.isAarch64 then "aarch64-apple-darwin"
     else throw "unsupported platform";
 
   bloop-bash = fetchurl {
@@ -35,8 +36,9 @@ stdenv.mkDerivation rec {
   bloop-binary = fetchurl rec {
     url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}";
     sha256 =
-      if stdenv.isLinux && stdenv.isx86_64 then "sha256-SnDXAkNu//Dn24FaQcACEBEJODlrhvpQ8uNbge99nGA="
-      else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-MfenrNbL1UBC4t/0w9MTDI+kz2HKv7xJcmA57qBbMFw="
+      if stdenv.isLinux && stdenv.isx86_64 then "sha256-xYVfgi3ANjBiuf4/5FDgSYDL/fPsvuJn4jFxAEVYct4="
+      else if stdenv.isDarwin && stdenv.isx86_64 then "sha256-lq0S2AsulcUUYDd3qnWonwd/W0/gb7lJwC+QTYTlTdg="
+      else if stdenv.isDarwin && stdenv.isAarch64 then "sha256-e+9Q7xIEsHloaKOj13vZnGs2vulkOJv7tCOuACobHvk="
       else throw "unsupported platform";
   };
 
@@ -67,7 +69,7 @@ stdenv.mkDerivation rec {
     license = licenses.asl20;
     description = "Scala build server and command-line tool to make the compile and test developer workflows fast and productive in a build-tool-agnostic way";
     mainProgram = "bloop";
-    platforms = [ "x86_64-linux" "x86_64-darwin" ];
+    platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ];
     maintainers = with maintainers; [ kubukoz tomahna ];
   };
 }

From a4eb2ac49f1fda386fc69d6c775d4bfd06e669dc Mon Sep 17 00:00:00 2001
From: Shawn8901 <shawn8901@googlemail.com>
Date: Thu, 19 Sep 2024 22:05:41 +0200
Subject: [PATCH 04/48] linux_xanmod: 6.6.51 -> 6.6.52

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

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index a9e75b651156..fa2c4fbf3c73 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -7,8 +7,8 @@ let
   # kernel config in the xanmod version commit
   variants = {
     lts = {
-      version = "6.6.51";
-      hash = "sha256-dNUTePfL6cAA0EmEG/D36dNJUobDRBHR5+BYrLIYot4=";
+      version = "6.6.52";
+      hash = "sha256-bTsxESXY0uhx9/UjUg9cATC1ErfkxF1gH8TXimYVzX4=";
     };
     main = {
       version = "6.10.10";

From a371dc4593c22cb633e7475cb423375856892ab2 Mon Sep 17 00:00:00 2001
From: Shawn8901 <shawn8901@googlemail.com>
Date: Thu, 19 Sep 2024 22:09:50 +0200
Subject: [PATCH 05/48] linux_xanmod_latest: 6.9.10 -> 6.9.10

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

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index fa2c4fbf3c73..e063a4148edc 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -11,8 +11,8 @@ let
       hash = "sha256-bTsxESXY0uhx9/UjUg9cATC1ErfkxF1gH8TXimYVzX4=";
     };
     main = {
-      version = "6.10.10";
-      hash = "sha256-abxhlF0zmY9WvcQ+FnkR5fNMvrw+oTCIMaCs8DFJ+oA=";
+      version = "6.10.11";
+      hash = "sha256-FDWFpiN0VvzdXcS3nZHm1HFgASazNX5+pL/8UJ3hkI8=";
     };
   };
 

From 728126dcd1e6568ad9f7621865c546e1b05f7141 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 21 Sep 2024 10:01:26 +0000
Subject: [PATCH 06/48] renode-dts2repl: 0-unstable-2024-09-05 ->
 0-unstable-2024-09-20

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

diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix
index eb0ca0e2614f..0ec4f7765b88 100644
--- a/pkgs/by-name/re/renode-dts2repl/package.nix
+++ b/pkgs/by-name/re/renode-dts2repl/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication {
   pname = "renode-dts2repl";
-  version = "0-unstable-2024-09-05";
+  version = "0-unstable-2024-09-20";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "antmicro";
     repo = "dts2repl";
-    rev = "3444d8aa86bb4ad3907c7d6886feafd65b8c2ff8";
-    hash = "sha256-aHSuu9dYmY4ZKs6bzJostzeO1hFgkt/VBAbs2Ntj6dU=";
+    rev = "b54beb5568509ed8dce6a43efa02a600e271a32f";
+    hash = "sha256-behdFayLes2Hr12KZ472jzTnELHMWRp3D5h6ZxLtqic=";
   };
 
   nativeBuildInputs = [

From f0b6425d738288f85381488cc3e25c30a441235c Mon Sep 17 00:00:00 2001
From: networkException <git@nwex.de>
Date: Sat, 21 Sep 2024 23:53:21 +0200
Subject: [PATCH 07/48] doc/build-helpers: fix wrong invokations of
 writeTextFile with destination

This patch fixes occurances of writeTextFile invokations with
a destination set but without a leading slash. This would cause
an opaque build time error.
---
 doc/build-helpers/trivial-build-helpers.chapter.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/build-helpers/trivial-build-helpers.chapter.md b/doc/build-helpers/trivial-build-helpers.chapter.md
index 31b42bd77426..ff00548e049a 100644
--- a/doc/build-helpers/trivial-build-helpers.chapter.md
+++ b/doc/build-helpers/trivial-build-helpers.chapter.md
@@ -501,7 +501,7 @@ writeTextFile {
   text = ''
     Contents of File
   '';
-  destination = "share/my-file";
+  destination = "/share/my-file";
 }
 ```
 
@@ -586,7 +586,7 @@ writeTextFile {
     echo "hi"
   '';
   executable = true;
-  destination = "bin/my-script";
+  destination = "/bin/my-script";
 }
 ```
 
@@ -674,7 +674,7 @@ writeTextFile {
     echo "hi"
   '';
   executable = true;
-  destination = "bin/my-script";
+  destination = "/bin/my-script";
 }
 ```
 

From 4b0564d94a098013b30058003e5c969d87caded4 Mon Sep 17 00:00:00 2001
From: Guanran Wang <guanran928@outlook.com>
Date: Sun, 22 Sep 2024 12:37:49 +0800
Subject: [PATCH 08/48] redlib: 0.35.1 -> 0.35.1-unstable-2024-09-22

---
 pkgs/by-name/re/redlib/package.nix | 32 +++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/re/redlib/package.nix b/pkgs/by-name/re/redlib/package.nix
index 3497bc9ba4d1..c1c661a9a330 100644
--- a/pkgs/by-name/re/redlib/package.nix
+++ b/pkgs/by-name/re/redlib/package.nix
@@ -1,23 +1,24 @@
-{ lib
-, stdenv
-, cacert
-, nixosTests
-, rustPlatform
-, fetchFromGitHub
-, darwin
+{
+  lib,
+  stdenv,
+  cacert,
+  nixosTests,
+  rustPlatform,
+  fetchFromGitHub,
+  darwin,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "redlib";
-  version = "0.35.1";
+  version = "0.35.1-unstable-2024-09-22";
 
   src = fetchFromGitHub {
     owner = "redlib-org";
     repo = "redlib";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-W1v7iOE60/6UyZSHQW+L+wHCoKnKUNb3kpm4LVLPZ6c=";
+    rev = "d5f137ce47de39e2c8c4ed09d13ba1f809bee560";
+    hash = "sha256-12XKeBCKciKummI43oTbKGkkY0mghA82ir2C3LhnwSs=";
   };
 
-  cargoHash = "sha256-3NQWiu/nTtHrivYL1pgxqQxEuIW0xfjxwK0ZEa2y1Kk=";
+  cargoHash = "sha256-XSmeJAK18J9WxrG5orFbAB9hWVLQQ50oB223oHT3OOk=";
 
   buildInputs = lib.optionals stdenv.isDarwin [
     darwin.apple_sdk.frameworks.Security
@@ -25,18 +26,25 @@ rustPlatform.buildRustPackage rec {
 
   checkFlags = [
     # All these test try to connect to Reddit.
+    # utils.rs
     "--skip=test_fetching_subreddit_quarantined"
     "--skip=test_fetching_nsfw_subreddit"
     "--skip=test_fetching_ws"
 
+    # client.rs
     "--skip=test_obfuscated_share_link"
     "--skip=test_share_link_strip_json"
-
     "--skip=test_localization_popular"
+
+    # subreddit.rs
     "--skip=test_fetching_subreddit"
+    "--skip=test_gated_and_quarantined"
+
+    # user.rs
     "--skip=test_fetching_user"
 
     # These try to connect to the oauth client
+    # oauth.rs
     "--skip=test_oauth_client"
     "--skip=test_oauth_client_refresh"
     "--skip=test_oauth_token_exists"

From 6215daa52004e2e36117fa204db95fce46598945 Mon Sep 17 00:00:00 2001
From: networkException <git@nwex.de>
Date: Sat, 21 Sep 2024 23:54:48 +0200
Subject: [PATCH 09/48] writeTextFile: assert destination starting with a /

This patch adds an assertion to the writeTextFile trivial
builder, asserting that a specified destination starts with
a slash.

This matches the current behavior of the function and merely
provides a helpful error message.
---
 pkgs/build-support/trivial-builders/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix
index 3bccc871a7dc..a02fe1fd6d0a 100644
--- a/pkgs/build-support/trivial-builders/default.nix
+++ b/pkgs/build-support/trivial-builders/default.nix
@@ -86,6 +86,13 @@ rec {
     , preferLocalBuild ? true
     , derivationArgs ? { }
     }:
+    assert lib.assertMsg (destination != "" -> (lib.hasPrefix "/" destination && destination != "/")) ''
+      destination must be an absolute path, relative to the derivation's out path,
+      got '${destination}' instead.
+
+      Ensure that the path starts with a / and specifies at least the filename.
+    '';
+
     let
       matches = builtins.match "/bin/([^/]+)" destination;
     in

From c4639f8cbc4e4a1852a2d462ce949fab9bf66d7e Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 23 Sep 2024 00:11:56 +0100
Subject: [PATCH 10/48] python27Packages.more-itertools: use
 `unittestCheckHook`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I thought that the Python 2 package set was entirely separate from
the Python 3 one, but this appears to actually be using the main
nose package. The actual code doesn’t use nose at all, and their
`tox.ini` uses unittest, so let’s fix that…
---
 pkgs/development/python2-modules/more-itertools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python2-modules/more-itertools/default.nix b/pkgs/development/python2-modules/more-itertools/default.nix
index 615b1d00d204..7a09dda8e9cd 100644
--- a/pkgs/development/python2-modules/more-itertools/default.nix
+++ b/pkgs/development/python2-modules/more-itertools/default.nix
@@ -1,7 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
-, nose
+, unittestCheckHook
 , six
 , stdenv
 }:
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     sha256 = "38a936c0a6d98a38bcc2d03fdaaedaba9f412879461dd2ceff8d37564d6522e4";
   };
 
-  nativeCheckInputs = [ nose ];
+  nativeCheckInputs = [ unittestCheckHook ];
   propagatedBuildInputs = [ six ];
 
   # iterable = range(10 ** 10)  # Is efficiently reversible

From b883630cfd6543b1774793e8fa417e3c3b3a6741 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Sat, 6 Apr 2024 17:49:36 +0200
Subject: [PATCH 11/48] omniorbpy: move to python-modules

---
 .../python-modules/omniorbpy/default.nix}     | 44 ++++++++++---------
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 26 insertions(+), 20 deletions(-)
 rename pkgs/{by-name/om/omniorbpy/package.nix => development/python-modules/omniorbpy/default.nix} (52%)

diff --git a/pkgs/by-name/om/omniorbpy/package.nix b/pkgs/development/python-modules/omniorbpy/default.nix
similarity index 52%
rename from pkgs/by-name/om/omniorbpy/package.nix
rename to pkgs/development/python-modules/omniorbpy/default.nix
index a288dc34c648..c541ddd2ba7d 100644
--- a/pkgs/by-name/om/omniorbpy/package.nix
+++ b/pkgs/development/python-modules/omniorbpy/default.nix
@@ -1,54 +1,58 @@
 {
   lib,
-  stdenv,
+  buildPythonPackage,
   fetchurl,
   omniorb,
   pkg-config,
-  python3,
+  python,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+buildPythonPackage rec {
   pname = "omniorbpy";
   version = "4.3.2";
+  pyproject = false;
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/omniorb/omniORBpy-${finalAttrs.version}.tar.bz2";
+    url = "http://downloads.sourceforge.net/omniorb/omniORBpy-${version}.tar.bz2";
     hash = "sha256-y1cX1BKhAbr0MPWYysfWkjGITa5DctjirfPd7rxffrs=";
   };
 
-  nativeBuildInputs = [
-    pkg-config
+  outputs = [
+    "out"
+    "dev"
   ];
 
-  propagatedBuildInputs = [
-    omniorb
-  ];
+  nativeBuildInputs = [ pkg-config ];
+
+  propagatedBuildInputs = [ omniorb ];
 
   configureFlags = [
     "--with-omniorb=${omniorb}"
     "PYTHON_PREFIX=$out"
-    "PYTHON=${lib.getExe python3}"
+    "PYTHON=${python.interpreter}"
   ];
 
   # Transform omniidl_be into a PEP420 namespace
   postInstall = ''
-    rm $out/${python3.sitePackages}/omniidl_be/__init__.py
-    rm $out/${python3.sitePackages}/omniidl_be/__pycache__/__init__.*.pyc
+    rm $out/${python.sitePackages}/omniidl_be/__init__.py
+    rm $out/${python.sitePackages}/omniidl_be/__pycache__/__init__.*.pyc
   '';
 
   # Ensure both python & cxx backends are available
-  doInstallCheck = true;
-  postInstallCheck = ''
-    export PYTHONPATH=$out/${python3.sitePackages}:${omniorb}/${python3.sitePackages}:$PYTHONPATH
-    ${lib.getExe python3} -c "import omniidl_be.cxx; import omniidl_be.python"
-  '';
-
+  pythonImportsCheck = [
+    "omniidl_be.cxx"
+    "omniidl_be.python"
+    "omniORB"
+  ];
 
   meta = with lib; {
     description = "Python backend for omniorb";
     homepage = "http://omniorb.sourceforge.net";
-    license = with licenses; [ gpl2Plus lgpl21Plus ];
+    license = with licenses; [
+      gpl2Plus
+      lgpl21Plus
+    ];
     maintainers = with maintainers; [ nim65s ];
     platforms = platforms.unix;
   };
-})
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a9231aecd6e8..32b947ce2e1b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9190,6 +9190,8 @@ self: super: with self; {
 
   omnilogic = callPackage ../development/python-modules/omnilogic { };
 
+  omniorbpy = callPackage ../development/python-modules/omniorbpy { };
+
   omorfi = callPackage ../development/python-modules/omorfi { };
 
   omrdatasettools = callPackage ../development/python-modules/omrdatasettools { };

From 87d42c3ea2fa86336ce7bde35ac896d689b587c4 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Sat, 6 Apr 2024 23:23:54 +0200
Subject: [PATCH 12/48] omniorb: add in python3Packages

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 32b947ce2e1b..b41922733dce 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9190,6 +9190,8 @@ self: super: with self; {
 
   omnilogic = callPackage ../development/python-modules/omnilogic { };
 
+  omniorb = toPythonModule (pkgs.omniorb.override { python3 = self.python; });
+
   omniorbpy = callPackage ../development/python-modules/omniorbpy { };
 
   omorfi = callPackage ../development/python-modules/omorfi { };

From c8e3b7cf2d77dd09010560300c1243fe4e0f9d9c Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Sat, 23 Mar 2024 10:59:50 +0100
Subject: [PATCH 13/48] osgqt: init at 3.5.7

---
 pkgs/by-name/os/osgqt/package.nix | 49 +++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 pkgs/by-name/os/osgqt/package.nix

diff --git a/pkgs/by-name/os/osgqt/package.nix b/pkgs/by-name/os/osgqt/package.nix
new file mode 100644
index 000000000000..12e88648edd8
--- /dev/null
+++ b/pkgs/by-name/os/osgqt/package.nix
@@ -0,0 +1,49 @@
+{
+  cmake,
+  fetchFromGitHub,
+  lib,
+  libsForQt5,
+  openscenegraph,
+  stdenv,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "osgQt";
+  version = "3.5.7";
+
+  src = fetchFromGitHub {
+    owner = "openscenegraph";
+    repo = "osgQt";
+    rev = finalAttrs.version;
+    hash = "sha256-iUeIqRDlcAHdKXWAi4WhEaOCxa7ZivQw0K5E7ccEKnM=";
+  };
+
+  buildInputs = [ libsForQt5.qtbase ];
+
+  nativeBuildInputs = [
+    cmake
+    libsForQt5.wrapQtAppsHook
+  ];
+
+  propagatedBuildInputs = [ openscenegraph ];
+
+  cmakeFlags = [
+    "-DDESIRED_QT_VERSION=5"
+    "-DOpenGL_GL_PREFERENCE=GLVND"
+  ];
+
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "FIND_PACKAGE(Qt5Widgets REQUIRED)" \
+      "FIND_PACKAGE(Qt5Widgets REQUIRED)
+       FIND_PACKAGE(Qt5OpenGL REQUIRED)"
+  '';
+
+  meta = {
+    description = "Qt bindings for OpenSceneGraph";
+    homepage = "https://github.com/openscenegraph/osgQt";
+    license = "OpenSceneGraph Public License - free LGPL-based license";
+    maintainers = [ lib.maintainers.nim65s ];
+    platforms = lib.platforms.unix;
+  };
+})

From 92e27aee5ff2922d28521caa20fcfc574f065795 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Sat, 29 Jun 2024 17:07:50 +0200
Subject: [PATCH 14/48] qgv: init at 1.3.5

---
 pkgs/by-name/qg/qgv/package.nix | 44 +++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 pkgs/by-name/qg/qgv/package.nix

diff --git a/pkgs/by-name/qg/qgv/package.nix b/pkgs/by-name/qg/qgv/package.nix
new file mode 100644
index 000000000000..d9ab3c7fc437
--- /dev/null
+++ b/pkgs/by-name/qg/qgv/package.nix
@@ -0,0 +1,44 @@
+{
+  cmake,
+  fetchFromGitHub,
+  graphviz,
+  jrl-cmakemodules,
+  lib,
+  libsForQt5,
+  stdenv,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "qgv";
+  version = "1.3.5";
+
+  src = fetchFromGitHub {
+    owner = "gepetto";
+    repo = "qgv";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-NUMCVqXw7euwxm4vISU8qYFfvV5HbAJsj/IjyxEjCPw=";
+  };
+
+  buildInputs = [
+    libsForQt5.qtbase
+    libsForQt5.qttools
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    libsForQt5.wrapQtAppsHook
+  ];
+
+  propagatedBuildInputs = [
+    graphviz
+    jrl-cmakemodules
+  ];
+
+  meta = {
+    description = "Interactive Qt graphViz display";
+    homepage = "https://github.com/gepetto/qgv";
+    license = lib.licenses.lgpl3Only;
+    maintainers = [ lib.maintainers.nim65s ];
+    platforms = lib.platforms.unix;
+  };
+})

From c0822c4979999a63416a3cdcadfc274ba340224a Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Mon, 29 Jul 2024 11:49:27 +0200
Subject: [PATCH 15/48] python-qt: fix link path

fix runtime error:
```
dyld[23235]: Library not loaded: libPythonQt-Qt5-Python3.12.3.dylib
  Referenced from: <C9EF5524-29A1-3E24-ABD4-DDEC31CF4B47> /nix/store/gnsk805im3lfr3zglmdap5p6j3zjpn05-python-qt-3.5.4/lib/libPythonQt_QtAll-Qt5-Python3.12.3.2.0.dylib
  Reason: tried: 'libPythonQt-Qt5-Python3.12.3.dylib' (no such file), '/System/Volumes/Preboot/Cryptexes/OSlibPythonQt-Qt5-Python3.12.3.dylib' (no such file), 'libPythonQt-Qt5-Python3.12.3.dylib' (no such file), '/usr/local/lib/libPythonQt-Qt5-Python3.12.3.dylib' (no such file), '/usr/lib/libPythonQt-Qt5-Python3.12.3.dylib' (no such file, not in dyld cache), '/Users/gsaurel/local/NixOS/nixpkgs/libPythonQt-Qt5-Python3.12.3.dylib' (no such file), '/System/Volumes/Preboot/Cryptexes/OS/Users/gsaurel/local/NixOS/nixpkgs/libPythonQt-Qt5-Python3.12.3.dylib' (no such file), '/Users/gsaurel/local/NixOS/nixpkgs/libPythonQt-Qt5-Python3.12.3.dylib' (no such file), '/usr/local/lib/libPythonQt-Qt5-Python3.12.3.dylib' (no such file), '/usr/lib/libPythonQt-Qt5-Python3.12.3.dylib' (no such file, not in dyld cache)
```
---
 pkgs/development/libraries/python-qt/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/python-qt/default.nix b/pkgs/development/libraries/python-qt/default.nix
index 10db26a03984..f79487a3c4b9 100644
--- a/pkgs/development/libraries/python-qt/default.nix
+++ b/pkgs/development/libraries/python-qt/default.nix
@@ -48,7 +48,10 @@ stdenv.mkDerivation (finalAttrs: {
     install_name_tool -id \
       $out/lib/libPythonQt-Qt5-Python3.${python3.sourceVersion.minor}.dylib \
       $out/lib/libPythonQt-Qt5-Python3.${python3.sourceVersion.minor}.dylib
-    install_name_tool -id \
+    install_name_tool -change \
+               libPythonQt-Qt5-Python3.${python3.sourceVersion.minor}.3.dylib \
+      $out/lib/libPythonQt-Qt5-Python3.${python3.sourceVersion.minor}.3.dylib \
+      -id \
       $out/lib/libPythonQt_QtAll-Qt5-Python3.${python3.sourceVersion.minor}.dylib \
       $out/lib/libPythonQt_QtAll-Qt5-Python3.${python3.sourceVersion.minor}.dylib
   '';

From 0cdccba62c8b9dc47f16e4afd3ae4265cf570223 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Mon, 29 Jul 2024 23:22:27 +0200
Subject: [PATCH 16/48] python-qt: add in python3Packages

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b41922733dce..74a2066256ab 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9077,6 +9077,8 @@ self: super: with self; {
 
   python-nvd3 = callPackage ../development/python-modules/python-nvd3 { };
 
+  python-qt = toPythonModule (pkgs.python-qt.override { python3 = self.python; });
+
   python-secp256k1-cardano = callPackage ../development/python-modules/python-secp256k1-cardano { };
 
   python-tds = callPackage ../development/python-modules/python-tds { };

From fdf6adcf90e9ec9d78c66e73e4184fb4d3dfd62b Mon Sep 17 00:00:00 2001
From: Sh0g0-1758 <shouryagoel10000@gmail.com>
Date: Mon, 23 Sep 2024 21:45:52 +0530
Subject: [PATCH 17/48] maintainers: add shogo

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index fae32c930536..774b6854ce10 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -18337,6 +18337,12 @@
     github = "kf5grd";
     githubId = 18297490;
   };
+  shogo = {
+    email = "shouryagoel10000@gmail.com";
+    github = "Sh0g0-1758";
+    githubId = 114918019;
+    name = "Shourya Goel";
+  };
   shortcord = {
     name = "Short Cord";
     email = "short@shortcord.com";

From 030f88a3267c43e0da02c1a3414664a88f49e921 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Mon, 23 Sep 2024 12:00:32 -0700
Subject: [PATCH 18/48] nixos/iptsd: Touch was renamed to Touchscreen in v3

---
 nixos/modules/services/hardware/iptsd.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/hardware/iptsd.nix b/nixos/modules/services/hardware/iptsd.nix
index 3a299c2428df..bfd4b3522792 100644
--- a/nixos/modules/services/hardware/iptsd.nix
+++ b/nixos/modules/services/hardware/iptsd.nix
@@ -18,15 +18,15 @@ in {
       type = lib.types.submodule {
         freeformType = format.type;
         options = {
-          Touch = {
+          Touchscreen = {
             DisableOnPalm = lib.mkOption {
               default = false;
-              description = "Ignore all touch inputs if a palm was registered on the display.";
+              description = "Ignore all touchscreen inputs if a palm was registered on the display.";
               type = lib.types.bool;
             };
             DisableOnStylus = lib.mkOption {
               default = false;
-              description = "Ignore all touch inputs if a stylus is in proximity.";
+              description = "Ignore all touchscreen inputs if a stylus is in proximity.";
               type = lib.types.bool;
             };
           };
@@ -43,6 +43,10 @@ in {
   };
 
   config = lib.mkIf cfg.enable {
+    warnings = lib.optional (lib.hasAttr "Touch" cfg.config) ''
+      The option `services.iptsd.config.Touch` has been renamed to `services.iptsd.config.Touchscreen`.
+    '';
+
     systemd.packages = [ pkgs.iptsd ];
     environment.etc."iptsd.conf".source = configFile;
     systemd.services."iptsd@".restartTriggers = [ configFile ];

From bccfcfbf775584597d0bc8259d94b7587835fbf4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 23 Sep 2024 22:36:30 +0000
Subject: [PATCH 19/48] wlx-overlay-s: 0.4.4 -> 0.5.0

---
 pkgs/by-name/wl/wlx-overlay-s/Cargo.lock  | 4 ++--
 pkgs/by-name/wl/wlx-overlay-s/package.nix | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/wl/wlx-overlay-s/Cargo.lock b/pkgs/by-name/wl/wlx-overlay-s/Cargo.lock
index 2a9c2efe03bf..8f089a061aaf 100644
--- a/pkgs/by-name/wl/wlx-overlay-s/Cargo.lock
+++ b/pkgs/by-name/wl/wlx-overlay-s/Cargo.lock
@@ -4556,7 +4556,7 @@ dependencies = [
 [[package]]
 name = "wlx-capture"
 version = "0.3.12"
-source = "git+https://github.com/galister/wlx-capture?tag=v0.3.12#14d2b8a13dad62849973fe90bed7be262aa07143"
+source = "git+https://github.com/galister/wlx-capture?tag=v0.3.13#c375a7c1d4b57741655a052ebe8af9fb4774f92d"
 dependencies = [
  "ashpd",
  "drm-fourcc",
@@ -4574,7 +4574,7 @@ dependencies = [
 
 [[package]]
 name = "wlx-overlay-s"
-version = "0.4.4"
+version = "0.5.0"
 dependencies = [
  "anyhow",
  "ash",
diff --git a/pkgs/by-name/wl/wlx-overlay-s/package.nix b/pkgs/by-name/wl/wlx-overlay-s/package.nix
index fb9404b3c8a4..c5fa7e2ffcb9 100644
--- a/pkgs/by-name/wl/wlx-overlay-s/package.nix
+++ b/pkgs/by-name/wl/wlx-overlay-s/package.nix
@@ -28,13 +28,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wlx-overlay-s";
-  version = "0.4.4";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "galister";
     repo = "wlx-overlay-s";
     rev = "v${version}";
-    hash = "sha256-+pWhtaYOzh7LPSCQeUTlU+/IxtcQTqRci9X7xEUV18U=";
+    hash = "sha256-FuhpHByeiUwB14+WHZ7ssJ8YPphs06jPcMhxiGfiaU8=";
   };
 
   cargoLock = {
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec {
       "openxr-0.18.0" = "sha256-ktkbhmExstkNJDYM/HYOwAwv3acex7P9SP0KMAOKhQk=";
       "ovr_overlay-0.0.0" = "sha256-5IMEI0IPTacbA/1gibYU7OT6r+Bj+hlQjDZ3Kg0L2gw=";
       "vulkano-0.34.0" = "sha256-o1KP/mscMG5j3U3xtei/2nMNEh7jLedcW1P0gL9Y1Rc=";
-      "wlx-capture-0.3.12" = "sha256-rZTJp7VhUvE/6lwESW2jKeGweFut6BvcxouG/nyl+GE=";
+      "wlx-capture-0.3.12" = "sha256-32WnAnNUSfsAA8WB9da3Wqb4acVlXh6HWsY9tPzCHEE=";
     };
   };
 

From 018771f0ef13c265a6cb481b42419329d1061905 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Sep 2024 00:07:26 +0000
Subject: [PATCH 20/48] uxn: 1.0-unstable-2024-08-29 -> 1.0-unstable-2024-09-20

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

diff --git a/pkgs/by-name/ux/uxn/package.nix b/pkgs/by-name/ux/uxn/package.nix
index 7cdb9de51d9e..721d82c6fdd6 100644
--- a/pkgs/by-name/ux/uxn/package.nix
+++ b/pkgs/by-name/ux/uxn/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "uxn";
-  version = "1.0-unstable-2024-08-29";
+  version = "1.0-unstable-2024-09-20";
 
   src = fetchFromSourcehut {
     owner = "~rabbits";
     repo = "uxn";
-    rev = "ea4aaca2a6e5bc1623bbd2bd892a6eff31439fcc";
-    hash = "sha256-1LA9IwnWcnr5fS1VP2wLWk6zNxNzJQ1VqAw5BsHz7tA=";
+    rev = "f8c53f59b012dd56d44ae50cdf90dd1dad6cce23";
+    hash = "sha256-Ee4hN3OnqF/OhKieGtzT4XOhNJIhywCgP6Us0DZTVBI=";
   };
 
   outputs = [ "out" "projects" ];

From 1587dccda45bdebcb9a597500de7aeecb37fc269 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Sep 2024 04:47:48 +0000
Subject: [PATCH 21/48] python312Packages.minio: 7.2.8 -> 7.2.9

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

diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix
index b65a4ccdcf06..84a248fddc5b 100644
--- a/pkgs/development/python-modules/minio/default.nix
+++ b/pkgs/development/python-modules/minio/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "minio";
-  version = "7.2.8";
+  version = "7.2.9";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "minio";
     repo = "minio-py";
     rev = "refs/tags/${version}";
-    hash = "sha256-BWzG8qYfTxk59lRAAL78YFCuHku8L2VxCSNpbi8Dr3k=";
+    hash = "sha256-ObbU0skqNBebkmX5gtJ9/QHlSZFB3tvaFnitmD+lKBc=";
   };
 
   postPatch = ''

From 2f75f84f158936460620f3ded7919e01d04227a3 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 24 Sep 2024 07:24:24 +0200
Subject: [PATCH 22/48] spyder: 6.0.0 -> 6.0.1

Changelog: https://github.com/spyder-ide/spyder/blob/master/CHANGELOG.md
---
 pkgs/development/python-modules/spyder/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/spyder/default.nix b/pkgs/development/python-modules/spyder/default.nix
index febf8c66dd3f..6c18f7e382e8 100644
--- a/pkgs/development/python-modules/spyder/default.nix
+++ b/pkgs/development/python-modules/spyder/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  pythonOlder,
 
   # dependencies
   aiohttp,
@@ -52,12 +51,12 @@
 
 buildPythonPackage rec {
   pname = "spyder";
-  version = "6.0.0";
+  version = "6.0.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-/UUtSpSkt1hJeIZfBLe8owP82jRx02kUF6TdfCsq6CY=";
+    hash = "sha256-cJeC6ICRWIu+YU3m673ntHVEpNbCJeGZ3lrSK3fYsTA=";
   };
 
   patches = [ ./dont-clear-pythonpath.patch ];

From 12b97a409bac470b2d6e53e09e512a723e836266 Mon Sep 17 00:00:00 2001
From: Markus Theil <theil.markus@gmail.com>
Date: Tue, 24 Sep 2024 07:51:40 +0200
Subject: [PATCH 23/48] openssl_3_3: move cmake rm to correct phase

Signed-off-by: Markus Theil <theil.markus@gmail.com>
---
 pkgs/development/libraries/openssl/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 4058ccd6c59f..993f9cdf9aa2 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -224,10 +224,6 @@ let
       rmdir $etc/etc/ssl/{certs,private}
     '' + lib.optionalString (conf != null) ''
       cat ${conf} > $etc/etc/ssl/openssl.cnf
-    '' + lib.optionalString (lib.versionAtLeast version "3.3.0") ''
-      # cleanup cmake helpers for now (for OpenSSL >= 3.3), only rely on pkg-config.
-      # pkg-config gets its paths fixed correctly
-      rm -rf $dev/lib/cmake
     '';
 
     postFixup = lib.optionalString (!stdenv.hostPlatform.isWindows) ''
@@ -237,6 +233,10 @@ let
         echo "Found an erroneous dependency on perl ^^^" >&2
         exit 1
       fi
+    '' + lib.optionalString (lib.versionAtLeast version "3.3.0") ''
+      # cleanup cmake helpers for now (for OpenSSL >= 3.3), only rely on pkg-config.
+      # pkg-config gets its paths fixed correctly
+      rm -rf $dev/lib/cmake
     '';
 
     passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

From cce37b6f5722d7980ff762d5b17d8f39c0a58c39 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 24 Sep 2024 08:32:31 +0200
Subject: [PATCH 24/48] python312Packages.tencentcloud-sdk-python: 3.0.1237 ->
 3.0.1238

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/refs/tags/3.0.1237...3.0.1238

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1238/CHANGELOG.md
---
 .../python-modules/tencentcloud-sdk-python/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index 94d272b429d7..3fd302784c4d 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1237";
+  version = "3.0.1238";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-5pzdj+Es0JunISOCID5KJ+cR42EjD+c0Pt/B9dVJw2k=";
+    hash = "sha256-+cLGJA4iZvcrzk5R7J/7l7oSQeU6DuhkChldndSOFEM=";
   };
 
   build-system = [ setuptools ];

From e2a5bb4295166239e1393b53a51ee68274196170 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 24 Sep 2024 08:35:40 +0200
Subject: [PATCH 25/48] python312Packages.minio: refactor

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

diff --git a/pkgs/development/python-modules/minio/default.nix b/pkgs/development/python-modules/minio/default.nix
index 84a248fddc5b..2cf9cd45c03c 100644
--- a/pkgs/development/python-modules/minio/default.nix
+++ b/pkgs/development/python-modules/minio/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   version = "7.2.9";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "minio";
@@ -39,9 +39,9 @@ buildPythonPackage rec {
       --replace-fail "assertEquals" "assertEqual"
   '';
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     argon2-cffi
     certifi
     urllib3

From cfc2ed809a1ac6e139f9e8e80b0a6ccd5bf936a3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 24 Sep 2024 08:46:58 +0200
Subject: [PATCH 26/48] python312Packages.pynmeagps: 1.0.41 -> 1.0.42

Diff: https://github.com/semuconsulting/pynmeagps/compare/refs/tags/v1.0.41...v1.0.42

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

diff --git a/pkgs/development/python-modules/pynmeagps/default.nix b/pkgs/development/python-modules/pynmeagps/default.nix
index 562e5ab869e4..99964e420c00 100644
--- a/pkgs/development/python-modules/pynmeagps/default.nix
+++ b/pkgs/development/python-modules/pynmeagps/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "pynmeagps";
-  version = "1.0.41";
+  version = "1.0.42";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "semuconsulting";
     repo = "pynmeagps";
     rev = "refs/tags/v${version}";
-    hash = "sha256-c80OACBwohlTBGvBZValv+AMOKLd32PrPf/JzqETjDU=";
+    hash = "sha256-hlGqc4vZ/C98vQwJewK0cfC3zP9xyO0oXXtlyNUDg0Y=";
   };
 
   postPatch = ''

From 54cf5519c8fff38d0722ff100fc07d5fe7e76c25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Tue, 24 Sep 2024 09:32:37 +0200
Subject: [PATCH 27/48] knot-dns: add support for dnstap

This grows the whole closure minimally (0.3 MiB by du),
and it can be useful in some deployments.
---
 pkgs/servers/dns/knot-dns/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index e3926fe4947d..fb71f0e3442f 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -1,6 +1,7 @@
 { lib, stdenv, fetchurl, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring
 , systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2, libmnl
 , ngtcp2-gnutls, xdp-tools
+, fstrm, protobufc
 , sphinx
 , autoreconfHook
 , nixosTests, knot-resolver, knot-dns, runCommandLocal
@@ -21,6 +22,7 @@ stdenv.mkDerivation rec {
     "--with-configdir=/etc/knot"
     "--with-rundir=/run/knot"
     "--with-storage=/var/lib/knot"
+    "--with-module-dnstap" "--enable-dnstap"
   ];
 
   patches = [
@@ -40,7 +42,7 @@ stdenv.mkDerivation rec {
     ngtcp2-gnutls  # DoQ support in kdig (and elsewhere but not much use there yet)
     libmaxminddb # optional for geoip module (it's tiny)
     # without sphinx &al. for developer documentation
-    # TODO: add dnstap support?
+    fstrm protobufc # dnstap support
   ] ++ lib.optionals stdenv.isLinux [
     libcap_ng systemd
     xdp-tools libbpf libmnl # XDP support (it's Linux kernel API)

From d71356bb9152fd0ffda2c9a23fe2a4a4d9b96a46 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 24 Sep 2024 11:29:30 +0200
Subject: [PATCH 28/48] python312Packages.ale-py: fix hash

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

diff --git a/pkgs/development/python-modules/ale-py/default.nix b/pkgs/development/python-modules/ale-py/default.nix
index 175da9c9b475..15836dee89ba 100644
--- a/pkgs/development/python-modules/ale-py/default.nix
+++ b/pkgs/development/python-modules/ale-py/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     owner = "Farama-Foundation";
     repo = "Arcade-Learning-Environment";
     rev = "refs/tags/v${version}";
-    hash = "sha256-JQG8Db7OEKQ7THkHJ+foUm/L7Ctr0Ur8nb6Zc2Z/MJI=";
+    hash = "sha256-tdxO5eixI2swezhkeSMqeVgdiaa/VmNdwhZYURSzadw=";
   };
 
   build-system = [

From f4ab5b8b860365307157c1a261835935bfffec1e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 24 Sep 2024 11:53:58 +0200
Subject: [PATCH 29/48] python312Packages.aioaseko: 0.2.0 -> 1.0.0

https://github.com/milanmeu/aioaseko/releases/tag/v1.0.0
---
 .../python-modules/aioaseko/default.nix          | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/aioaseko/default.nix b/pkgs/development/python-modules/aioaseko/default.nix
index 54ab5e62bcf3..7deb0174408a 100644
--- a/pkgs/development/python-modules/aioaseko/default.nix
+++ b/pkgs/development/python-modules/aioaseko/default.nix
@@ -1,17 +1,18 @@
 {
   lib,
   aiohttp,
+  apischema,
   buildPythonPackage,
   fetchFromGitHub,
+  gql,
   pythonOlder,
   setuptools,
-  pyjwt,
 }:
 
 buildPythonPackage rec {
   pname = "aioaseko";
-  version = "0.2.0";
-  format = "pyproject";
+  version = "1.0.0";
+  pyproject = true;
 
   disabled = pythonOlder "3.8";
 
@@ -19,14 +20,15 @@ buildPythonPackage rec {
     owner = "milanmeu";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-X2H+5roq5yNXET23Q3QNmYmG1oAFfvuvSsInsJi42/s=";
+    hash = "sha256-jUvpu/lOFKRUwEuYD1zRp0oODjf4AgH84fnGngtv9jw=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     aiohttp
-    pyjwt
+    apischema
+    gql
   ];
 
   # Module has no tests

From ffd8155660907bd9073c4b5b8f1ee12cddb4878a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 24 Sep 2024 10:32:57 +0200
Subject: [PATCH 30/48] python312Packages.airgradient: 0.8.0 -> 0.9.0

Diff: https://github.com/airgradienthq/python-airgradient/compare/refs/tags/v0.8.0...v0.9.0

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

diff --git a/pkgs/development/python-modules/airgradient/default.nix b/pkgs/development/python-modules/airgradient/default.nix
index 2eed753ffa90..86773cfd4c27 100644
--- a/pkgs/development/python-modules/airgradient/default.nix
+++ b/pkgs/development/python-modules/airgradient/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "airgradient";
-  version = "0.8.0";
+  version = "0.9.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "airgradienthq";
     repo = "python-airgradient";
     rev = "refs/tags/v${version}";
-    hash = "sha256-NONOfM61oCtiNgmKCXvkEvCzSjumwjaeuzg9l/7hX8M=";
+    hash = "sha256-BBJ9pYE9qAE62FJFwycWBnvsoeobjsg0uIDZffIg18o=";
   };
 
   build-system = [ poetry-core ];

From 564fa97ede1b8549ba398e845bee6e05886e42ea Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 24 Sep 2024 11:55:36 +0200
Subject: [PATCH 31/48] home-assistant: 2024.9.2 -> 2024.9.3

https://github.com/home-assistant/core/releases/tag/2024.9.3
---
 pkgs/servers/home-assistant/component-packages.nix | 2 +-
 pkgs/servers/home-assistant/default.nix            | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index eea3a1881e5f..8ef2dda17da7 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "2024.9.2";
+  version = "2024.9.3";
   components = {
     "3_day_blinds" = ps: with ps; [
     ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 5459606f7cb9..a664cf0fa9d7 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -408,7 +408,7 @@ let
   extraBuildInputs = extraPackages python.pkgs;
 
   # Don't forget to run update-component-packages.py after updating
-  hassVersion = "2024.9.2";
+  hassVersion = "2024.9.3";
 
 in python.pkgs.buildPythonApplication rec {
   pname = "homeassistant";
@@ -426,13 +426,13 @@ in python.pkgs.buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     rev = "refs/tags/${version}";
-    hash = "sha256-qAnEdH1MDPsCKDubpYL5AswcsaPqGm+TrKdBcDD3np8=";
+    hash = "sha256-W/qngUrc/R3lqdIWUFIXtP9IJ6t+VGdeAdJyZuGm94Q=";
   };
 
   # Secondary source is pypi sdist for translations
   sdist = fetchPypi {
     inherit pname version;
-    hash = "sha256-gWQU18GfnsxttRzpoN9WeNeHOgioTxF9DmG2SwNuzEY=";
+    hash = "sha256-Qp1AiB89sq1OrAVR7qLEfX1j8kW8L2lb4Z1x4z4AzP0=";
   };
 
   build-system = with python.pkgs; [

From 7f83e6f787d27c1251ae6ab064c8eba55f3f3f3f Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Sat, 29 Jun 2024 16:56:33 +0200
Subject: [PATCH 32/48] gepetto-viewer: init at 5.1.0

---
 pkgs/by-name/ge/gepetto-viewer/package.nix | 136 +++++++++++++++++++++
 pkgs/top-level/python-packages.nix         |   2 +
 2 files changed, 138 insertions(+)
 create mode 100644 pkgs/by-name/ge/gepetto-viewer/package.nix

diff --git a/pkgs/by-name/ge/gepetto-viewer/package.nix b/pkgs/by-name/ge/gepetto-viewer/package.nix
new file mode 100644
index 000000000000..3ea4da20ece0
--- /dev/null
+++ b/pkgs/by-name/ge/gepetto-viewer/package.nix
@@ -0,0 +1,136 @@
+{
+  boost,
+  cmake,
+  darwin,
+  doxygen,
+  fetchFromGitHub,
+  fetchpatch,
+  fontconfig,
+  lib,
+  jrl-cmakemodules,
+  libsForQt5,
+  makeWrapper,
+  openscenegraph,
+  osgqt,
+  pkg-config,
+  python3Packages,
+  qgv,
+  stdenv,
+  runCommand,
+}:
+let
+  gepetto-viewer = stdenv.mkDerivation (finalAttrs: {
+    pname = "gepetto-viewer";
+    version = "5.1.0";
+
+    src = fetchFromGitHub {
+      owner = "gepetto";
+      repo = "gepetto-viewer";
+      rev = "v${finalAttrs.version}";
+      hash = "sha256-A2J3HidG+OHJO8LpLiOEvORxDtViTdeVD85AmKkkOg8=";
+    };
+
+    patches = [
+      # fix use of CMAKE_INSTALL_BINDIR for $bin output
+      (fetchpatch {
+        url = "https://github.com/Gepetto/gepetto-viewer/pull/230/commits/9b1b3a61da016934c3e766e6b491c1d6f3fc80d6.patch";
+        hash = "sha256-dpviEkOyCZpTYntZ4sCG1AvobljJphPQxg7gA6JxfWs=";
+      })
+      # fix use of CMAKE_INSTALL_FULL_INCLUDEDIR for $dev output
+      (fetchpatch {
+        url = "https://github.com/Gepetto/gepetto-viewer/pull/230/commits/4e1c2bbe063db20b605e51495e9f9eca40138cca.patch";
+        hash = "sha256-HrecvW1ulCSt9+DUaQVBOoDkilGRqU2+GUx7NUw7hqc=";
+      })
+    ];
+
+    cmakeFlags = [
+      (lib.cmakeBool "BUILD_PY_QCUSTOM_PLOT" (!stdenv.isDarwin))
+      (lib.cmakeBool "BUILD_PY_QGV" (!stdenv.isDarwin))
+    ];
+
+    outputs = [
+      "out"
+      "dev"
+      "bin"
+      "doc"
+    ];
+
+    buildInputs = [
+      python3Packages.boost
+      python3Packages.python-qt
+      libsForQt5.qtbase
+    ];
+
+    nativeBuildInputs = [
+      cmake
+      doxygen
+      libsForQt5.wrapQtAppsHook
+      pkg-config
+      python3Packages.python
+    ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ darwin.autoSignDarwinBinariesHook ];
+
+    propagatedBuildInputs = [
+      jrl-cmakemodules
+      openscenegraph
+      osgqt
+      qgv
+    ];
+
+    doCheck = true;
+
+    # wrapQtAppsHook uses isMachO, which fails to detect binaries without this
+    # ref. https://github.com/NixOS/nixpkgs/pull/138334
+    preFixup = lib.optionalString stdenv.isDarwin "export LC_ALL=C";
+
+    postFixup = ''
+      # CMake is not aware exports are in $dev
+      substituteInPlace $dev/lib/cmake/gepetto-viewer/gepetto-viewerConfig.cmake --replace-fail \
+        "$out/lib/cmake" \
+        "$dev/lib/cmake"
+
+      # wrapQtAppsHook does only wrap stuff in $out, we want $bin
+      echo wrapping $bin/bin/gepetto-gui
+      wrapQtApp $bin/bin/gepetto-gui
+    '';
+
+    # Fontconfig error: Cannot load default config file: No such file: (null)
+    env.FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf";
+
+    # Fontconfig error: No writable cache directories
+    preBuild = "export XDG_CACHE_HOME=$(mktemp -d)";
+
+    passthru.withPlugins =
+      plugins:
+      runCommand "gepetto-gui"
+        {
+          meta = {
+            # can't just "inherit (gepetto-viewer) meta;" because:
+            # error: derivation '/nix/store/…-gepetto-gui.drv' does not have wanted outputs 'bin'
+            inherit (gepetto-viewer.meta)
+              description
+              homepage
+              license
+              maintainers
+              mainProgram
+              platforms
+              ;
+          };
+          nativeBuildInputs = [ makeWrapper ];
+          propagatedBuildInputs = plugins;
+        }
+        ''
+          makeWrapper ${lib.getExe gepetto-viewer} $out/bin/gepetto-gui \
+            --set GEPETTO_GUI_PLUGIN_DIRS ${lib.makeLibraryPath plugins}
+        '';
+
+    meta = {
+      description = "Graphical Interface for Pinocchio and HPP.";
+      homepage = "https://github.com/gepetto/gepetto-viewer";
+      license = lib.licenses.lgpl3Only;
+      maintainers = [ lib.maintainers.nim65s ];
+      mainProgram = "gepetto-gui";
+      platforms = lib.platforms.unix;
+    };
+  });
+in
+gepetto-viewer
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 74a2066256ab..db75a639d833 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4982,6 +4982,8 @@ self: super: with self; {
 
   georss-wa-dfes-client = callPackage ../development/python-modules/georss-wa-dfes-client { };
 
+  gepetto-viewer = toPythonModule (pkgs.gepetto-viewer.override { python3Packages = self; });
+
   gerbonara = callPackage ../development/python-modules/gerbonara { };
 
   getjump = callPackage ../development/python-modules/getjump { };

From e4b87b0a6033fb969aa6dd8d5aa51e8680e0dbd0 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Mon, 23 Sep 2024 17:57:39 +0200
Subject: [PATCH 33/48] gepetto-viewer-corba: init at 5.8.0

---
 .../ge/gepetto-viewer-corba/package.nix       | 69 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 ++
 2 files changed, 73 insertions(+)
 create mode 100644 pkgs/by-name/ge/gepetto-viewer-corba/package.nix

diff --git a/pkgs/by-name/ge/gepetto-viewer-corba/package.nix b/pkgs/by-name/ge/gepetto-viewer-corba/package.nix
new file mode 100644
index 000000000000..1760bea79abb
--- /dev/null
+++ b/pkgs/by-name/ge/gepetto-viewer-corba/package.nix
@@ -0,0 +1,69 @@
+{
+  boost,
+  cmake,
+  doxygen,
+  fetchFromGitHub,
+  fontconfig,
+  gepetto-viewer,
+  lib,
+  pkg-config,
+  python3Packages,
+  libsForQt5,
+  stdenv,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "gepetto-viewer-corba";
+  version = "5.8.0";
+  pyproject = false; # CMake
+
+  src = fetchFromGitHub {
+    owner = "gepetto";
+    repo = "gepetto-viewer-corba";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-/bpAs4ca/+QjWEGuHhuDT8Ts2Ggg+DZWETZfjho6E0w=";
+  };
+
+  outputs = [
+    "out"
+    "doc"
+  ];
+
+  postPatch = ''
+    substituteInPlace src/CMakeLists.txt \
+      --replace-fail "ARGUMENTS $" "ARGUMENTS -p${python3Packages.omniorbpy}/${python3Packages.python.sitePackages} $" \
+      --replace-fail '$'{CMAKE_SOURCE_DIR}/cmake '$'{JRL_CMAKE_MODULES}
+  '';
+
+  buildInputs = [ libsForQt5.qtbase ];
+
+  nativeBuildInputs = [
+    cmake
+    doxygen
+    libsForQt5.wrapQtAppsHook
+    pkg-config
+    python3Packages.omniorb
+  ];
+
+  propagatedBuildInputs = [
+    python3Packages.boost
+    python3Packages.gepetto-viewer
+    python3Packages.omniorbpy
+  ];
+
+  doCheck = true;
+
+  # Fontconfig error: Cannot load default config file: No such file: (null)
+  env.FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf";
+
+  # Fontconfig error: No writable cache directories
+  preBuild = "export XDG_CACHE_HOME=$(mktemp -d)";
+
+  meta = {
+    homepage = "https://github.com/gepetto/gepetto-viewer-corba";
+    description = "CORBA client/server for gepetto-viewer.";
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.nim65s ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index db75a639d833..fa1c0c8834ab 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4982,6 +4982,10 @@ self: super: with self; {
 
   georss-wa-dfes-client = callPackage ../development/python-modules/georss-wa-dfes-client { };
 
+  gepetto-gui = toPythonModule (gepetto-viewer.withPlugins [ gepetto-viewer-corba ]);
+
+  gepetto-viewer-corba = toPythonModule (pkgs.gepetto-viewer-corba.override { python3Packages = self; });
+
   gepetto-viewer = toPythonModule (pkgs.gepetto-viewer.override { python3Packages = self; });
 
   gerbonara = callPackage ../development/python-modules/gerbonara { };

From 273ffdbc341b0b580c67205c11303758ae412f43 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Sep 2024 10:43:31 +0000
Subject: [PATCH 34/48] nerdfetch: 8.2.1 -> 8.3.0

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

diff --git a/pkgs/by-name/ne/nerdfetch/package.nix b/pkgs/by-name/ne/nerdfetch/package.nix
index 659cc3deb9c3..c470b12e114d 100644
--- a/pkgs/by-name/ne/nerdfetch/package.nix
+++ b/pkgs/by-name/ne/nerdfetch/package.nix
@@ -5,13 +5,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "nerdfetch";
-  version = "8.2.1";
+  version = "8.3.0";
 
   src = fetchFromGitHub {
     owner = "ThatOneCalculator";
     repo = "NerdFetch";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-9S7mS+lUCT8/Q65fqlrnTksuK3mhynPX+jWPaV8U8Dg=";
+    hash = "sha256-CQjIxXGuEUdUbbdclVKshsz/AdkgDTTACoNCVFrHqas=";
   };
 
   dontUnpack = true;

From f0961222c9060fab9f1e806f30f80ae6d455ec56 Mon Sep 17 00:00:00 2001
From: Sh0g0-1758 <shouryagoel10000@gmail.com>
Date: Tue, 24 Sep 2024 16:27:19 +0530
Subject: [PATCH 35/48] alive2: init at 0-unstable-2024-09-23

---
 pkgs/by-name/al/alive2/package.nix | 67 ++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 pkgs/by-name/al/alive2/package.nix

diff --git a/pkgs/by-name/al/alive2/package.nix b/pkgs/by-name/al/alive2/package.nix
new file mode 100644
index 000000000000..f627751189c8
--- /dev/null
+++ b/pkgs/by-name/al/alive2/package.nix
@@ -0,0 +1,67 @@
+{
+  lib,
+  clangStdenv,
+  fetchFromGitHub,
+  re2c,
+  z3,
+  hiredis,
+  llvm_18,
+  cmake,
+  ninja,
+}:
+
+clangStdenv.mkDerivation (finalAttrs: {
+  pname = "alive2";
+  version = "0-unstable-2024-09-23";
+
+  src = fetchFromGitHub {
+    owner = "AliveToolkit";
+    repo = "alive2";
+    rev = "05a964284056b38a6dc1f807e7acad64a0308328";
+    sha256 = "sha256-okKKUU7WLXLD9Hvsfoz+1HQWoyQ/bqRpBk5ogr7kSJA=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+  ];
+  buildInputs = [
+    re2c
+    z3
+    hiredis
+    llvm_18
+    ninja
+  ];
+
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'find_package(Git REQUIRED)' ""
+  '';
+
+  env = {
+    ALIVE2_HOME = "$PWD";
+    LLVM2_HOME = "${llvm_18}";
+    LLVM2_BUILD = "$LLVM2_HOME/build";
+  };
+
+  preBuild = ''
+    mkdir -p build
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/bin
+    cp alive $out/bin/
+    cp alive-jobserver $out/bin/
+    rm -rf $out/bin/CMakeFiles $out/bin/*.o
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Automatic verification of LLVM optimizations";
+    homepage = "https://github.com/AliveToolkit/alive2";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ shogo ];
+    mainProgram = "alive";
+  };
+})

From 94721c1f73403fdd988286ddcc9b42c279105e58 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 24 Sep 2024 12:59:01 +0200
Subject: [PATCH 36/48] python312Packages.homeassistant-stubs: 2024.9.2 ->
 2024.9.3

https://github.com/KapJI/homeassistant-stubs/releases/tag/2024.9.3
---
 pkgs/servers/home-assistant/stubs.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix
index 67645e0c578b..93b21249b886 100644
--- a/pkgs/servers/home-assistant/stubs.nix
+++ b/pkgs/servers/home-assistant/stubs.nix
@@ -1,14 +1,15 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, poetry-core
+, hatchling
+, hatch-vcs
 , home-assistant
 , python
 }:
 
 buildPythonPackage rec {
   pname = "homeassistant-stubs";
-  version = "2024.9.2";
+  version = "2024.9.3";
   pyproject = true;
 
   disabled = python.version != home-assistant.python.version;
@@ -17,19 +18,20 @@ buildPythonPackage rec {
     owner = "KapJI";
     repo = "homeassistant-stubs";
     rev = "refs/tags/${version}";
-    hash = "sha256-o5bk63yErDOqNlYeGD7nMNuQ2p9rQuRYXlmfIMo8w8k=";
+    hash = "sha256-ohk0Gxq+q7PH/+SRMEu4KFz/xoc/TDeuEzTnMjaYMBU=";
   };
 
   build-system = [
-    poetry-core
+    hatchling
+    hatch-vcs
     home-assistant
   ];
 
   postPatch = ''
     # Relax constraint to year and month
     substituteInPlace pyproject.toml --replace-fail \
-      'homeassistant = "${version}"' \
-      'homeassistant = "~${lib.versions.majorMinor home-assistant.version}"'
+      'homeassistant==${version}' \
+      'homeassistant~=${lib.versions.majorMinor home-assistant.version}'
   '';
 
   pythonImportsCheck = [

From 569d16da801f065bec7efe56f167ebc89abb51fe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Sep 2024 11:12:57 +0000
Subject: [PATCH 37/48] lms: 3.57.0 -> 3.58.0

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

diff --git a/pkgs/by-name/lm/lms/package.nix b/pkgs/by-name/lm/lms/package.nix
index 2ac44af53ab8..cfc7edfacc2b 100644
--- a/pkgs/by-name/lm/lms/package.nix
+++ b/pkgs/by-name/lm/lms/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lms";
-  version = "3.57.0";
+  version = "3.58.0";
 
   src = fetchFromGitHub {
     owner = "epoupon";
     repo = "lms";
     rev = "v${version}";
-    hash = "sha256-KeskFVTZMxsFefbjnRBfrbS88Wt+2kwzboDziBsZJrY=";
+    hash = "sha256-sWlD/n9Qjwiu/UfZrxRxwv2rc4XwRZN35fyjIriGZPY=";
   };
 
   strictDeps = true;

From ee19fa930074f3c1d7cc0ae94783c968e6206b6d Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 24 Sep 2024 14:40:03 +0200
Subject: [PATCH 38/48] python312Packages.cohere: 5.9.2 -> 5.9.4

Diff: https://github.com/cohere-ai/cohere-python/compare/refs/tags/5.9.2...5.9.4

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

diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix
index 61bf159a4b5b..482cba0c24cc 100644
--- a/pkgs/development/python-modules/cohere/default.nix
+++ b/pkgs/development/python-modules/cohere/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "cohere";
-  version = "5.9.2";
+  version = "5.9.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cohere-ai";
     repo = "cohere-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-7vyaKrMpD1DPe8qptprsAK24kzAwSL4fu53uEqJ1VWE=";
+    hash = "sha256-RtBbS2t0298EyW30yRnqstmXkiU36tou0dsbf6Tq1xE=";
   };
 
   build-system = [ poetry-core ];

From b59d78a9bce1fef8d3671e6132ee1c4b61478ae5 Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Sun, 22 Sep 2024 16:03:14 +0000
Subject: [PATCH 39/48] xen: patch with XSA-462

---
 .../virtualization/xen/4.17/default.nix       |  1 +
 .../virtualization/xen/4.18/default.nix       |  1 +
 .../virtualization/xen/4.19/default.nix       |  1 +
 .../virtualization/xen/generic/patches.nix    | 22 +++++++++++++++++++
 4 files changed, 25 insertions(+)

diff --git a/pkgs/applications/virtualization/xen/4.17/default.nix b/pkgs/applications/virtualization/xen/4.17/default.nix
index 2bf93a79be0d..d270c37f2ce8 100644
--- a/pkgs/applications/virtualization/xen/4.17/default.nix
+++ b/pkgs/applications/virtualization/xen/4.17/default.nix
@@ -16,6 +16,7 @@ let
     with upstreamPatches;
     [
       QUBES_REPRODUCIBLE_BUILDS
+      XSA_462
     ]
   );
 in
diff --git a/pkgs/applications/virtualization/xen/4.18/default.nix b/pkgs/applications/virtualization/xen/4.18/default.nix
index 2aa731b6f244..21d6de13f1b0 100644
--- a/pkgs/applications/virtualization/xen/4.18/default.nix
+++ b/pkgs/applications/virtualization/xen/4.18/default.nix
@@ -16,6 +16,7 @@ let
     with upstreamPatches;
     [
       QUBES_REPRODUCIBLE_BUILDS
+      XSA_462
     ]
   );
 in
diff --git a/pkgs/applications/virtualization/xen/4.19/default.nix b/pkgs/applications/virtualization/xen/4.19/default.nix
index 5b8cf5d21788..a1b133704285 100644
--- a/pkgs/applications/virtualization/xen/4.19/default.nix
+++ b/pkgs/applications/virtualization/xen/4.19/default.nix
@@ -18,6 +18,7 @@ let
       QUBES_REPRODUCIBLE_BUILDS
       XSA_460
       XSA_461
+      XSA_462
     ]
   );
 in
diff --git a/pkgs/applications/virtualization/xen/generic/patches.nix b/pkgs/applications/virtualization/xen/generic/patches.nix
index 35abfdd86a91..4bb58d5a4216 100644
--- a/pkgs/applications/virtualization/xen/generic/patches.nix
+++ b/pkgs/applications/virtualization/xen/generic/patches.nix
@@ -134,4 +134,26 @@ in
     cve = [ "CVE-2024-31146" ];
     hash = "sha256-JQWoqf47hy9WXNkVC/LgmjUhkxN0SBF6w8PF4aFZxhM=";
   };
+  # Xen Security Advisory #462: (4.16.6 - 4.19.0)
+  "XSA_462" = xsaPatch {
+    id = "462";
+    title = "x86: Deadlock in vlapic_error()";
+    description = ''
+      In x86's APIC (Advanced Programmable Interrupt Controller) architecture,
+      error conditions are reported in a status register.  Furthermore, the OS
+      can opt to receive an interrupt when a new error occurs.
+
+      It is possible to configure the error interrupt with an illegal vector,
+      which generates an error when an error interrupt is raised.
+
+      This case causes Xen to recurse through vlapic_error().  The recursion
+      itself is bounded; errors accumulate in the the status register and only
+      generate an interrupt when a new status bit becomes set.
+
+      However, the lock protecting this state in Xen will try to be taken
+      recursively, and deadlock.
+    '';
+    cve = [ "CVE-2024-45817" ];
+    hash = "sha256-01lzjaT2f69UfEdTUCkm92DDOmd+Mo8sNPZsHJfgJEM=";
+  };
 }

From 1ec3f1dbbf81c413948f72de17b47347f253444b Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 24 Sep 2024 15:02:37 +0200
Subject: [PATCH 40/48] =?UTF-8?q?Revert=20"gcc:=20gcc=5F13=20=E2=86=92=20g?=
 =?UTF-8?q?cc=5F14"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit e9cdb2274152ab7e7646406cebec791a47a48c7d.

We've encountered multiple GCC 14 internal compiler errors on aarch64.
If we wanted to keep it as the default compiler, we'd either have to
track the 14.x release branch, or backport about half of it.  One
Bugzilla thread mentions six patches that should be backported.  This
doesn't feel good to have as the default compiler.  Let's stick with
13 for now until 14.3 is released, hopefully with all the fixes.
---
 nixos/doc/manual/release-notes/rl-2411.section.md | 2 --
 pkgs/top-level/all-packages.nix                   | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index 12cb8b38704f..68fd59fa96c2 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -17,8 +17,6 @@
     [2.24](https://nix.dev/manual/nix/latest/release-notes/rl-2.24).
   Notable changes include improvements to Git fetching, documentation comment support in `nix-repl> :doc`, as well as many quality of life improvements.
 
-- GCC now defaults to major version 14 from previous 13. ([GCC Porting Guide](https://gcc.gnu.org/gcc-14/porting_to.html))
-
 - Convenience options for `amdgpu`, open source driver for Radeon cards, is now available under `hardware.amdgpu`.
 
 - [AMDVLK](https://github.com/GPUOpen-Drivers/AMDVLK), AMD's open source Vulkan driver, is now available to be configured as `hardware.amdgpu.amdvlk` option.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 26b089ea720d..e74a52d29697 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14695,7 +14695,7 @@ with pkgs;
 
   gbforth = callPackage ../development/compilers/gbforth { };
 
-  default-gcc-version = 14;
+  default-gcc-version = 13;
   gcc = pkgs.${"gcc${toString default-gcc-version}"};
   gccFun = callPackage ../development/compilers/gcc;
   gcc-unwrapped = gcc.cc;

From 04acbe17fa29dfe615f2bd98c67647e5259fc45a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 24 Sep 2024 13:15:13 +0000
Subject: [PATCH 41/48] aiken: 1.1.2 -> 1.1.3

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

diff --git a/pkgs/by-name/ai/aiken/package.nix b/pkgs/by-name/ai/aiken/package.nix
index 866a59c49323..1f8186ef0015 100644
--- a/pkgs/by-name/ai/aiken/package.nix
+++ b/pkgs/by-name/ai/aiken/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "aiken";
-  version = "1.1.2";
+  version = "1.1.3";
 
   src = fetchFromGitHub {
     owner = "aiken-lang";
     repo = "aiken";
     rev = "v${version}";
-    hash = "sha256-os8OqLX6vxHQvrn+X8/BeYnfZJSKG7GDScz7ikJ4sl8=";
+    hash = "sha256-n373MgPjJzP+yRSQLA07RijFBjbRItK/nX8k7SJ6ITE=";
   };
 
-  cargoHash = "sha256-7VoTL9W9KboBhhxB9nkzPag6IR/RsXZUDVXjdzOITVM=";
+  cargoHash = "sha256-gQ7DfYyVF6Gk8N+spBd97BWxTwydq+lDbnCsVPPzWLU=";
 
   buildInputs =
     [ openssl ]

From 68e10d1549abf1082e548a239562b27f9e9f599e Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 1 Sep 2024 09:51:13 +0200
Subject: [PATCH 42/48] python312Packages.distributed: 2024.8.1 -> 2024.9.0

Diff:
https://github.com/dask/distributed/compare/refs/tags/2024.8.1...2024.9.0

Changelog: https://github.com/dask/distributed/releases/tag/2024.9.0
---
 .../python-modules/distributed/default.nix    | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix
index 78610bb9a9a6..4df88aaf493d 100644
--- a/pkgs/development/python-modules/distributed/default.nix
+++ b/pkgs/development/python-modules/distributed/default.nix
@@ -1,40 +1,41 @@
 {
   lib,
   buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+  setuptools-scm,
+  versioneer,
+
+  # dependencies
   click,
   cloudpickle,
   dask,
-  fetchFromGitHub,
   jinja2,
   locket,
   msgpack,
   packaging,
   psutil,
-  pythonOlder,
   pyyaml,
-  setuptools,
-  setuptools-scm,
   sortedcontainers,
   tblib,
   toolz,
   tornado,
   urllib3,
-  versioneer,
   zict,
 }:
 
 buildPythonPackage rec {
   pname = "distributed";
-  version = "2024.8.2";
+  version = "2024.9.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.10";
-
   src = fetchFromGitHub {
     owner = "dask";
     repo = "distributed";
     rev = "refs/tags/${version}";
-    hash = "sha256-RvaWczbj/afOqTo9WPLJBkPG6li/TUwe84NS08zQMtY=";
+    hash = "sha256-jzifqTGHAto+7LExUs0kSd8852EfELEL8acSElXlEx0=";
   };
 
   postPatch = ''

From 5ac4df73d975418a6494c518d950a5e615b05110 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 1 Sep 2024 09:51:22 +0200
Subject: [PATCH 43/48] python312Packages.dask: 2024.8.1 -> 2024.9.0

Diff: https://github.com/dask/dask/compare/refs/tags/2024.8.1...2024.9.0

Changelog: https://docs.dask.org/en/latest/changelog.html
---
 pkgs/development/python-modules/dask/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix
index 0aa358b334af..7ea1779fd21e 100644
--- a/pkgs/development/python-modules/dask/default.nix
+++ b/pkgs/development/python-modules/dask/default.nix
@@ -34,22 +34,19 @@
   pytest-rerunfailures,
   pytest-xdist,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 let
   self = buildPythonPackage rec {
     pname = "dask";
-    version = "2024.8.1";
+    version = "2024.9.0";
     pyproject = true;
 
-    disabled = pythonOlder "3.10";
-
     src = fetchFromGitHub {
       owner = "dask";
       repo = "dask";
       rev = "refs/tags/${version}";
-      hash = "sha256-ztB5T8VFc1WoQB7lWQlonAyq7duqft9OE5FYvmjZd48=";
+      hash = "sha256-CaTxhYT2diFOBylLH36iIR1ooWzi2e/RNOnvc11DtDY=";
     };
 
     build-system = [ setuptools ];

From c79d04d726aabcb632e914e6838a1be48dc827e8 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 1 Sep 2024 16:03:34 +0200
Subject: [PATCH 44/48] python312Packages.dask-expr: 1.1.11 -> 1.1.14

Diff:
https://github.com/dask/dask-expr/compare/refs/tags/v1.1.11...1.1.14
---
 pkgs/development/python-modules/dask-expr/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/dask-expr/default.nix b/pkgs/development/python-modules/dask-expr/default.nix
index 750ef7613197..b7130a40ceb9 100644
--- a/pkgs/development/python-modules/dask-expr/default.nix
+++ b/pkgs/development/python-modules/dask-expr/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
 
   # build-system
@@ -21,16 +20,14 @@
 
 buildPythonPackage rec {
   pname = "dask-expr";
-  version = "1.1.11";
+  version = "1.1.14";
   pyproject = true;
 
-  disabled = pythonOlder "3.10";
-
   src = fetchFromGitHub {
     owner = "dask";
     repo = "dask-expr";
     rev = "refs/tags/v${version}";
-    hash = "sha256-D26b8HkcRqsMuzSTZdmDmS59dlAbj4F93kfY27UAhKw=";
+    hash = "sha256-yDNkIATN6AuGzcxTwAQyaQaDQ48v45hTC2fUqEThl/g=";
   };
 
   postPatch = ''

From 41f9b746e8600e7c2ce1fd2095e0f09db9dd3574 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 19 Sep 2024 22:11:20 +0200
Subject: [PATCH 45/48] python312Packages.dask-awkward: 2024.7.0 -> 2024.9.0

Diff: https://github.com/dask-contrib/dask-awkward/compare/refs/tags/2024.7.0...2024.9.0

Changelog: https://github.com/dask-contrib/dask-awkward/releases/tag/2024.9.0
---
 pkgs/development/python-modules/dask-awkward/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix
index e952a358e9d6..8f14ceb76e1f 100644
--- a/pkgs/development/python-modules/dask-awkward/default.nix
+++ b/pkgs/development/python-modules/dask-awkward/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
 
   # build-system
@@ -31,8 +30,6 @@ buildPythonPackage rec {
   version = "2024.9.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "dask-contrib";
     repo = "dask-awkward";

From 44c3a8b26a16f27f7a17fa4358e5b5977774aac5 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 19 Sep 2024 22:12:36 +0200
Subject: [PATCH 46/48] python312Packages.dask-histogram: 2024.3.0 -> 2024.9.1

Diff: https://github.com/dask-contrib/dask-histogram/compare/refs/tags/2024.3.0...2024.9.1

Changelog: https://github.com/dask-contrib/dask-histogram/releases/tag/2024.9.1
---
 .../python-modules/dask-histogram/default.nix          | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dask-histogram/default.nix b/pkgs/development/python-modules/dask-histogram/default.nix
index af6b480c259c..032f978cdef9 100644
--- a/pkgs/development/python-modules/dask-histogram/default.nix
+++ b/pkgs/development/python-modules/dask-histogram/default.nix
@@ -2,10 +2,16 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  boost-histogram,
-  dask,
+
+  # build-system
   hatchling,
   hatch-vcs,
+
+  # dependencies
+  boost-histogram,
+  dask,
+
+  # tests
   pytestCheckHook,
 }:
 

From 5620491106cfe8c2db0628161b93830d66506ffc Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 19 Sep 2024 22:55:25 +0200
Subject: [PATCH 47/48] python312Packages.dask-jobqueue: 0.8.5 -> 0.9.0

Diff: https://github.com/dask/dask-jobqueue/compare/refs/tags/0.8.5...0.9.0
---
 .../python-modules/dask-jobqueue/default.nix  | 98 ++++++++++---------
 1 file changed, 51 insertions(+), 47 deletions(-)

diff --git a/pkgs/development/python-modules/dask-jobqueue/default.nix b/pkgs/development/python-modules/dask-jobqueue/default.nix
index 55a528499d44..c4c2100ae032 100644
--- a/pkgs/development/python-modules/dask-jobqueue/default.nix
+++ b/pkgs/development/python-modules/dask-jobqueue/default.nix
@@ -1,8 +1,7 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
-  pythonOlder,
-  pythonAtLeast,
   fetchFromGitHub,
 
   # build-system
@@ -20,17 +19,14 @@
 
 buildPythonPackage rec {
   pname = "dask-jobqueue";
-  version = "0.8.5";
+  version = "0.9.0";
   pyproject = true;
 
-  # Python 3.12 support should be added in 0.8.6
-  disabled = pythonOlder "3.8" || pythonAtLeast "3.12";
-
   src = fetchFromGitHub {
     owner = "dask";
     repo = "dask-jobqueue";
     rev = "refs/tags/${version}";
-    hash = "sha256-NBFfPTNIXezwv7f1P3VRnkBYlOutD30+8rdiBBssHDE=";
+    hash = "sha256-YujfhjOJzl4xsjjsyrQkEu/CBR04RwJ79c1iSTcMIgw=";
   };
 
   build-system = [ setuptools ];
@@ -46,46 +42,54 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTests = [
-    # Require some unavailable pytest fixtures
-    "test_adapt"
-    "test_adaptive"
-    "test_adaptive_cores_mem"
-    "test_adaptive_grouped"
-    "test_adapt_parameters"
-    "test_basic"
-    "test_basic_scale_edge_cases"
-    "test_cluster"
-    "test_cluster_error_scheduler_arguments_should_use_scheduler_options"
-    "test_cluster_has_cores_and_memory"
-    "test_command_template"
-    "test_complex_cancel_command"
-    "test_config"
-    "test_dashboard_link"
-    "test_default_number_of_worker_processes"
-    "test_deprecation_env_extra"
-    "test_deprecation_extra"
-    "test_deprecation_job_extra"
-    "test_different_interfaces_on_scheduler_and_workers"
-    "test_docstring_cluster"
-    "test_extra_args_broken_cancel"
-    "test_forward_ip"
-    "test_import_scheduler_options_from_config"
-    "test_job"
-    "test_jobqueue_job_call"
-    "test_log_directory"
-    "test_scale_cores_memory"
-    "test_scale_grouped"
-    "test_scheduler_options"
-    "test_scheduler_options_interface"
-    "test_security"
-    "test_security_temporary"
-    "test_security_temporary_defaults"
-    "test_shebang_settings"
-    "test_use_stdin"
-    "test_worker_name_uses_cluster_name"
-    "test_wrong_parameter_error"
-  ];
+  disabledTests =
+    [
+      # Require some unavailable pytest fixtures
+      "test_adapt"
+      "test_adaptive"
+      "test_adaptive_cores_mem"
+      "test_adaptive_grouped"
+      "test_adapt_parameters"
+      "test_basic"
+      "test_basic_scale_edge_cases"
+      "test_cluster"
+      "test_cluster_error_scheduler_arguments_should_use_scheduler_options"
+      "test_cluster_has_cores_and_memory"
+      "test_command_template"
+      "test_complex_cancel_command"
+      "test_config"
+      "test_dashboard_link"
+      "test_default_number_of_worker_processes"
+      "test_deprecation_env_extra"
+      "test_deprecation_extra"
+      "test_deprecation_job_extra"
+      "test_different_interfaces_on_scheduler_and_workers"
+      "test_docstring_cluster"
+      "test_extra_args_broken_cancel"
+      "test_forward_ip"
+      "test_import_scheduler_options_from_config"
+      "test_job"
+      "test_jobqueue_job_call"
+      "test_log_directory"
+      "test_scale_cores_memory"
+      "test_scale_grouped"
+      "test_scheduler_options"
+      "test_scheduler_options_interface"
+      "test_security"
+      "test_security_temporary"
+      "test_security_temporary_defaults"
+      "test_shebang_settings"
+      "test_use_stdin"
+      "test_worker_name_uses_cluster_name"
+      "test_wrong_parameter_error"
+    ]
+    ++ lib.optionals stdenv.isDarwin [
+      # ValueError: invalid operation on non-started TCPListener
+      "test_header"
+      "test_lsf_unit_detection"
+      "test_lsf_unit_detection_without_file"
+      "test_runner"
+    ];
 
   pythonImportsCheck = [ "dask_jobqueue" ];
 

From e480154f61b12abb27f057b21db9f87becbf6e61 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 24 Sep 2024 18:05:12 +0200
Subject: [PATCH 48/48] Revert "libaom,libvmaf: pin to GCC 13 on aarch64"

This reverts commit adb8dffe97f307fba886b8ec35d09b2e438b09c7.

The default GCC has been reverted to 13.  We won't be upgrading to 14
until after the next minor release comes out, which will include the
fix for the issue being worked around here.
---
 pkgs/top-level/all-packages.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 26b089ea720d..443379cf3594 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20752,10 +20752,7 @@ with pkgs;
 
   libantlr3c = callPackage ../development/libraries/libantlr3c { };
 
-  libaom = callPackage ../development/libraries/libaom {
-    # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116737
-    stdenv = if stdenv.hostPlatform.isAarch64 && stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "14" then gcc13Stdenv else stdenv;
-  };
+  libaom = callPackage ../development/libraries/libaom { };
 
   libappindicator-gtk2 = libappindicator.override { gtkVersion = "2"; };
   libappindicator-gtk3 = libappindicator.override { gtkVersion = "3"; };
@@ -21948,10 +21945,7 @@ with pkgs;
 
   libvisual = callPackage ../development/libraries/libvisual { };
 
-  libvmaf = callPackage ../development/libraries/libvmaf {
-    # See libaom
-    stdenv = if stdenv.hostPlatform.isAarch64 && stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "14" then gcc13Stdenv else stdenv;
-  };
+  libvmaf = callPackage ../development/libraries/libvmaf { };
 
   libvncserver = callPackage ../development/libraries/libvncserver {
     inherit (darwin.apple_sdk.frameworks) Carbon;