From 505e078f737869743a2d127695fc6404fb15c75e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Sep 2024 15:15:40 +0000
Subject: [PATCH 01/59] iputils: 20240117 -> 20240905

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

diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix
index 1be7debb895c..b87fe51434f3 100644
--- a/pkgs/os-specific/linux/iputils/default.nix
+++ b/pkgs/os-specific/linux/iputils/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "iputils";
-  version = "20240117";
+  version = "20240905";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = version;
-    hash = "sha256-sERY8ZKuXiY85cXdNWOm4byiNU7mOVIeA55dgQJHdoE=";
+    hash = "sha256-2CjzIOe1hrW3He9DN+w+Wi2zaaMBkVEdA7dezTpkx8I=";
   };
 
   outputs = [ "out" "apparmor" ];

From f7e7cd2ff6841eb50604a3bd7554ec18d68e8b98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sun, 22 Sep 2024 16:07:53 +0200
Subject: [PATCH 02/59] nix-serve: mark as broken on darwin

also remove unused patch
---
 .../package-management/nix-serve/default.nix  |  2 +
 .../nix-serve/nix-command.patch               | 40 -------------------
 2 files changed, 2 insertions(+), 40 deletions(-)
 delete mode 100644 pkgs/tools/package-management/nix-serve/nix-command.patch

diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix
index f8e181e9fa21..2ece72b66bf1 100644
--- a/pkgs/tools/package-management/nix-serve/default.nix
+++ b/pkgs/tools/package-management/nix-serve/default.nix
@@ -58,6 +58,8 @@ stdenv.mkDerivation {
     description = "Utility for sharing a Nix store as a binary cache";
     maintainers = [ maintainers.eelco ];
     license = licenses.lgpl21;
+    # See https://github.com/edolstra/nix-serve/issues/57
+    broken = stdenv.isDarwin;
     platforms = nix.meta.platforms;
     mainProgram = "nix-serve";
   };
diff --git a/pkgs/tools/package-management/nix-serve/nix-command.patch b/pkgs/tools/package-management/nix-serve/nix-command.patch
deleted file mode 100644
index 5bf8eaac8711..000000000000
--- a/pkgs/tools/package-management/nix-serve/nix-command.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 9e434fff4486afeb3cc3f631f6dc56492b204704 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
-Date: Wed, 31 Jul 2024 23:53:31 +0200
-Subject: [PATCH] add extra-experimental-features for nix-command
-
-fixes https://github.com/NixOS/nixpkgs/pull/331230
----
- nix-serve.psgi | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/nix-serve.psgi b/nix-serve.psgi
-index 928fa3b..65a8680 100644
---- a/nix-serve.psgi
-+++ b/nix-serve.psgi
-@@ -64,7 +64,7 @@ my $app = sub {
-         return [404, ['Content-Type' => 'text/plain'], ["Incorrect NAR hash. Maybe the path has been recreated.\n"]]
-             unless $narHash eq "sha256:$expectedNarHash";
-         my $fh = new IO::Handle;
--        open $fh, "-|", "nix", "dump-path", "--", $storePath;
-+        open $fh, "-|", "nix", "--extra-experimental-features", "nix-command", "dump-path", "--", $storePath;
-         return [200, ['Content-Type' => 'text/plain', 'Content-Length' => $narSize], $fh];
-     }
- 
-@@ -75,14 +75,14 @@ my $app = sub {
-         return [404, ['Content-Type' => 'text/plain'], ["No such path.\n"]] unless $storePath;
-         my ($deriver, $narHash, $time, $narSize, $refs) = $store->queryPathInfo($storePath, 1) or die;
-         my $fh = new IO::Handle;
--        open $fh, "-|", "nix", "dump-path", "--", $storePath;
-+        open $fh, "-|", "nix", "--extra-experimental-features", "nix-command", "dump-path", "--", $storePath;
-         return [200, ['Content-Type' => 'text/plain', 'Content-Length' => $narSize], $fh];
-     }
- 
-     elsif ($path =~ /^\/log\/([0-9a-z]+-[0-9a-zA-Z\+\-\.\_\?\=]+)/) {
-         my $storePath = "$Nix::Config::storeDir/$1";
-         my $fh = new IO::Handle;
--        open $fh, "-|", "nix", "log", $storePath;
-+        open $fh, "-|", "nix", "--extra-experimental-features", "nix-command", "log", $storePath;
-         return [200, ['Content-Type' => 'text/plain' ], $fh];
-     }
- 

From e4659cb5e546ef56cfe5fc6ba8462e320a29c277 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Thu, 10 Oct 2024 11:27:40 +0200
Subject: [PATCH 03/59] pkgsStatic.gusb: fix build

---
 pkgs/development/libraries/gusb/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gusb/default.nix b/pkgs/development/libraries/gusb/default.nix
index 3e75bdecaecd..c49df7fd75fe 100644
--- a/pkgs/development/libraries/gusb/default.nix
+++ b/pkgs/development/libraries/gusb/default.nix
@@ -5,6 +5,8 @@
 , meson
 , ninja
 , pkg-config
+, buildPackages
+, withIntrospection ? lib.meta.availableOn stdenv.hostPlatform gobject-introspection && stdenv.hostPlatform.emulatorAvailable buildPackages
 , gobject-introspection
 , gi-docgen
 , python3
@@ -25,7 +27,8 @@ stdenv.mkDerivation rec {
   pname = "gusb";
   version = "0.4.9";
 
-  outputs = [ "bin" "out" "dev" "devdoc" ];
+  outputs = [ "bin" "out" "dev" ]
+    ++ lib.optionals withIntrospection [ "devdoc" ];
 
   src = fetchFromGitHub {
     owner = "hughsie";
@@ -51,6 +54,7 @@ stdenv.mkDerivation rec {
     meson
     ninja
     pkg-config
+  ] ++ lib.optionals withIntrospection [
     gobject-introspection
     gi-docgen
     vala
@@ -64,7 +68,10 @@ stdenv.mkDerivation rec {
   ];
 
   mesonFlags = [
+    (lib.mesonBool "docs" withIntrospection)
+    (lib.mesonBool "introspection" withIntrospection)
     (lib.mesonBool "tests" doCheck)
+    (lib.mesonBool "vapi" withIntrospection)
     (lib.mesonOption "usb_ids" "${hwdata}/share/hwdata/usb.ids")
   ];
 

From 5aa48b41bd2a7137d934db463d66ebabbebfaace Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 13 Oct 2024 12:56:56 +0000
Subject: [PATCH 04/59] cifs-utils: 7.0 -> 7.1

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

diff --git a/pkgs/os-specific/linux/cifs-utils/default.nix b/pkgs/os-specific/linux/cifs-utils/default.nix
index cae7901386d1..0e2f6a0639fe 100644
--- a/pkgs/os-specific/linux/cifs-utils/default.nix
+++ b/pkgs/os-specific/linux/cifs-utils/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "cifs-utils";
-  version = "7.0";
+  version = "7.1";
 
   src = fetchurl {
     url = "mirror://samba/pub/linux-cifs/cifs-utils/${pname}-${version}.tar.bz2";
-    sha256 = "sha256-De+quFvT6kb/xFq0H7DQrVTQWuLPqn5QPehtTxK8gWE=";
+    sha256 = "sha256-ohEj92pKajbJZTGJukkY6988/NP5CScwpH/zRQtbWyo=";
   };
 
   nativeBuildInputs = [ autoreconfHook docutils pkg-config ];

From 13bf9925ac22f3755695659ad2ed97e127289a3e Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Thu, 17 Oct 2024 21:29:59 +0200
Subject: [PATCH 05/59] alsaequal: switch to live src

---
 pkgs/tools/audio/alsaequal/default.nix    | 12 +++++++-----
 pkgs/tools/audio/alsaequal/makefile.patch |  4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/audio/alsaequal/default.nix b/pkgs/tools/audio/alsaequal/default.nix
index 73b95f9fe7cc..24bef265b24d 100644
--- a/pkgs/tools/audio/alsaequal/default.nix
+++ b/pkgs/tools/audio/alsaequal/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl
+{ lib, stdenv, fetchFromGitHub
 , alsa-lib, caps
 }:
 
@@ -6,9 +6,11 @@ stdenv.mkDerivation rec {
   pname = "alsaequal";
   version = "0.6";
 
-  src = fetchurl {
-    url = "https://thedigitalmachine.net/tools/alsaequal-${version}.tar.bz2";
-    sha256 = "1w3g9q5z3nrn3mwdhaq6zsg0jila8d102dgwgrhj9vfx58apsvli";
+  src = fetchFromGitHub {
+    owner = "bassdr";
+    repo = "alsaequal";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-cCo8qWQv4bQ+RvH43Xbj+Q4qC5DmvracBuzI96EAnhY=";
   };
 
   buildInputs = [ alsa-lib ];
@@ -36,7 +38,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Real-time adjustable equalizer plugin for ALSA";
-    homepage = "https://thedigitalmachine.net/alsaequal.html";
+    homepage = "https://github.com/bassdr/alsaequal";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ ymeister ];
   };
diff --git a/pkgs/tools/audio/alsaequal/makefile.patch b/pkgs/tools/audio/alsaequal/makefile.patch
index ee8aa170d60b..5fd7062d73de 100644
--- a/pkgs/tools/audio/alsaequal/makefile.patch
+++ b/pkgs/tools/audio/alsaequal/makefile.patch
@@ -4,8 +4,8 @@
 
  install: all
  	@echo Installing...
--	$(Q)install -m 644 $(SND_PCM_BIN) ${DESTDIR}/usr/lib/alsa-lib/
--	$(Q)install -m 644 $(SND_CTL_BIN) ${DESTDIR}/usr/lib/alsa-lib/
+-	$(Q)install -m 644 $(SND_PCM_BIN) /usr/lib/alsa-lib/
+-	$(Q)install -m 644 $(SND_CTL_BIN) /usr/lib/alsa-lib/
 +	$(Q)install -m 755 $(SND_PCM_BIN) ${DESTDIR}/lib/alsa-lib/
 +	$(Q)install -m 755 $(SND_CTL_BIN) ${DESTDIR}/lib/alsa-lib/
 

From ad9cfe30fa45c414254ee960956babb5bb4905cc Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Thu, 17 Oct 2024 21:38:09 +0200
Subject: [PATCH 06/59] alsaequal: 0.6 -> 0.7.1

---
 pkgs/tools/audio/alsaequal/caps_9.x.patch    | 21 --------------------
 pkgs/tools/audio/alsaequal/default.nix       | 16 +++++++--------
 pkgs/tools/audio/alsaequal/false_error.patch | 13 ------------
 pkgs/tools/audio/alsaequal/makefile.patch    | 10 ++++++----
 4 files changed, 14 insertions(+), 46 deletions(-)
 delete mode 100644 pkgs/tools/audio/alsaequal/caps_9.x.patch
 delete mode 100644 pkgs/tools/audio/alsaequal/false_error.patch

diff --git a/pkgs/tools/audio/alsaequal/caps_9.x.patch b/pkgs/tools/audio/alsaequal/caps_9.x.patch
deleted file mode 100644
index 282e04049747..000000000000
--- a/pkgs/tools/audio/alsaequal/caps_9.x.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- ./ctl_equal.c
-+++ ./ctl_equal.c
-@@ -167,7 +167,7 @@
- 	snd_ctl_equal_t *equal;
- 	const char *controls = ".alsaequal.bin";
- 	const char *library = "/usr/lib/ladspa/caps.so";
--	const char *module = "Eq";
-+	const char *module = "Eq10";
- 	long channels = 2;
- 	const char *sufix = " Playback Volume";
- 	int err, i, index;
---- ./pcm_equal.c
-+++ ./pcm_equal.c
-@@ -151,7 +151,7 @@
- 	snd_config_t *sconf = NULL;
- 	const char *controls = ".alsaequal.bin";
- 	const char *library = "/usr/lib/ladspa/caps.so";
--	const char *module = "Eq";
-+	const char *module = "Eq10";
- 	long channels = 2;
- 	int err;
diff --git a/pkgs/tools/audio/alsaequal/default.nix b/pkgs/tools/audio/alsaequal/default.nix
index 24bef265b24d..d35facd6c3d9 100644
--- a/pkgs/tools/audio/alsaequal/default.nix
+++ b/pkgs/tools/audio/alsaequal/default.nix
@@ -1,19 +1,23 @@
 { lib, stdenv, fetchFromGitHub
-, alsa-lib, caps
+, alsa-lib, caps,
+  ladspaH
 }:
 
 stdenv.mkDerivation rec {
   pname = "alsaequal";
-  version = "0.6";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "bassdr";
     repo = "alsaequal";
     rev = "refs/tags/v${version}";
-    hash = "sha256-cCo8qWQv4bQ+RvH43Xbj+Q4qC5DmvracBuzI96EAnhY=";
+    hash = "sha256-jI+w/jCFslQSNeIS7mwb+LZSawU4XjbSNNgpvuShH1g=";
   };
 
-  buildInputs = [ alsa-lib ];
+  buildInputs = [
+    alsa-lib
+    ladspaH
+  ];
 
   makeFlags = [ "DESTDIR=$(out)" ];
 
@@ -22,10 +26,6 @@ stdenv.mkDerivation rec {
     # Adds executable permissions to resulting libraries
     # and changes their destination directory from "usr/lib/alsa-lib" to "lib/alsa-lib" to better align with nixpkgs filesystem hierarchy.
     ./makefile.patch
-    # Fixes control port check, which resulted in false error.
-    ./false_error.patch
-    # Fixes name change of an "Eq" to "Eq10" method in version 9 of caps library.
-    ./caps_9.x.patch
   ];
 
   postPatch = ''
diff --git a/pkgs/tools/audio/alsaequal/false_error.patch b/pkgs/tools/audio/alsaequal/false_error.patch
deleted file mode 100644
index 1a8413da2741..000000000000
--- a/pkgs/tools/audio/alsaequal/false_error.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./ctl_equal.c
-+++ ./ctl_equal.c
-@@ -263,8 +263,8 @@
- 	for(i = 0; i < equal->num_input_controls; i++) {
- 		if(equal->control_data->control[i].type == LADSPA_CNTRL_INPUT) {
- 			index = equal->control_data->control[i].index;
--			if(equal->klass->PortDescriptors[index] !=
--					(LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL)) {
-+			if(equal->klass->PortDescriptors[index] &
-+					(LADSPA_PORT_INPUT | LADSPA_PORT_CONTROL) == 0) {
- 				SNDERR("Problem with control file %s, %d.", controls, index);
- 				return -1;
- 			}
diff --git a/pkgs/tools/audio/alsaequal/makefile.patch b/pkgs/tools/audio/alsaequal/makefile.patch
index 5fd7062d73de..2dc46a4c8d2b 100644
--- a/pkgs/tools/audio/alsaequal/makefile.patch
+++ b/pkgs/tools/audio/alsaequal/makefile.patch
@@ -4,10 +4,12 @@
 
  install: all
  	@echo Installing...
--	$(Q)install -m 644 $(SND_PCM_BIN) /usr/lib/alsa-lib/
--	$(Q)install -m 644 $(SND_CTL_BIN) /usr/lib/alsa-lib/
-+	$(Q)install -m 755 $(SND_PCM_BIN) ${DESTDIR}/lib/alsa-lib/
-+	$(Q)install -m 755 $(SND_CTL_BIN) ${DESTDIR}/lib/alsa-lib/
+-	$(Q)mkdir -p ${DESTDIR}/usr/$(LIBDIR)/alsa-lib/
+-	$(Q)install -m 755 $(SND_PCM_BIN) ${DESTDIR}/usr/$(LIBDIR)/alsa-lib/
+-	$(Q)install -m 755 $(SND_CTL_BIN) ${DESTDIR}/usr/$(LIBDIR)/alsa-lib/
++	$(Q)mkdir -p ${DESTDIR}/$(LIBDIR)/alsa-lib/
++	$(Q)install -m 755 $(SND_PCM_BIN) ${DESTDIR}/$(LIBDIR)/alsa-lib/
++	$(Q)install -m 755 $(SND_CTL_BIN) ${DESTDIR}/$(LIBDIR)/alsa-lib/
 
  uninstall:
  	@echo Un-installing...

From 7b15fe7c6d9bef2f92775d56ecea6ba8a795d846 Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Sun, 20 Oct 2024 12:59:45 +0200
Subject: [PATCH 07/59] zfs: change tests into attrset

---
 pkgs/os-specific/linux/zfs/2_1.nix      | 6 +++---
 pkgs/os-specific/linux/zfs/2_2.nix      | 7 +++----
 pkgs/os-specific/linux/zfs/unstable.nix | 6 +++---
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/2_1.nix b/pkgs/os-specific/linux/zfs/2_1.nix
index d950f5cac15d..885ebca73abb 100644
--- a/pkgs/os-specific/linux/zfs/2_1.nix
+++ b/pkgs/os-specific/linux/zfs/2_1.nix
@@ -22,9 +22,9 @@ callPackage ./generic.nix args {
 
   hash = "sha256-zFO8fMbirEOrn5W57rAN7IWY6EIXG8jDXqhP7BWJyiY=";
 
-  tests = [
-    nixosTests.zfs.series_2_1
-  ];
+  tests = {
+    inherit (nixosTests.zfs) series_2_1;
+  };
 
   maintainers = [ lib.maintainers.raitobezarius ];
 }
diff --git a/pkgs/os-specific/linux/zfs/2_2.nix b/pkgs/os-specific/linux/zfs/2_2.nix
index befb83b20569..9d8be86258d5 100644
--- a/pkgs/os-specific/linux/zfs/2_2.nix
+++ b/pkgs/os-specific/linux/zfs/2_2.nix
@@ -19,10 +19,9 @@ callPackage ./generic.nix args {
   # this package should point to the latest release.
   version = "2.2.6";
 
-  tests = [
-    nixosTests.zfs.installer
-    nixosTests.zfs.series_2_2
-  ];
+  tests = {
+    inherit (nixosTests.zfs) installer series_2_2;
+  };
 
   maintainers = with lib.maintainers; [ adamcstephens amarshall ];
 
diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix
index 3fb46077d886..4893c3e32152 100644
--- a/pkgs/os-specific/linux/zfs/unstable.nix
+++ b/pkgs/os-specific/linux/zfs/unstable.nix
@@ -23,9 +23,9 @@ callPackage ./generic.nix args {
   version = "2.2.6";
   # rev = "";
 
-  tests = [
-    nixosTests.zfs.unstable
-  ];
+  tests = {
+    inherit (nixosTests.zfs) unstable;
+  };
 
   hash = "sha256-wkgoYg6uQOHVq8a9sJXzO/QXJ6q28l7JXWkC+BFvOb0=";
 }

From c7c0e0d24c31bb066cc8611f016b0b91427390d2 Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Sun, 20 Oct 2024 00:54:02 +0200
Subject: [PATCH 08/59] raylib: change tests to attrset

---
 pkgs/development/libraries/raylib/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/raylib/default.nix b/pkgs/development/libraries/raylib/default.nix
index 5c1b7d1dab0a..086d6ae60c82 100644
--- a/pkgs/development/libraries/raylib/default.nix
+++ b/pkgs/development/libraries/raylib/default.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
   ] ++ lib.optional includeEverything "-DINCLUDE_EVERYTHING=ON"
   ++ lib.optional sharedLib "-DBUILD_SHARED_LIBS=ON";
 
-  passthru.tests = [ raylib-games ];
+  passthru.tests = { inherit raylib-games; };
 
   patches = [
     # Patch version in CMakeLists.txt to 5.0.0

From 52e02e3f9f891497f192aeeacdd7753f6a486872 Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Sun, 20 Oct 2024 13:59:24 +0200
Subject: [PATCH 09/59] synfigstudio: enable parallel building for the `synfig`
 derivation

This was enabled for `synfigstudio`, but not for `synfig`, leading to
long build times.
---
 pkgs/applications/graphics/synfigstudio/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix
index e19da3fa15fe..128d10295e5f 100644
--- a/pkgs/applications/graphics/synfigstudio/default.nix
+++ b/pkgs/applications/graphics/synfigstudio/default.nix
@@ -78,6 +78,8 @@ let
       "CXXFLAGS=-std=c++14"
     ];
 
+    enableParallelBuilding = true;
+
     nativeBuildInputs = [
       pkg-config
       autoreconfHook

From 0ccf369ca9c73fae1cf24f315946c1d78dd5add4 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 22 Oct 2024 22:33:17 +0800
Subject: [PATCH 10/59] =?UTF-8?q?webkitgtk:=202.46.1=20=E2=86=92=202.46.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/WebKit/WebKit/compare/webkitgtk-2.46.1...webkitgtk-2.46.2
https://webkitgtk.org/2024/10/21/webkitgtk2.46.2-released.html
---
 pkgs/development/libraries/webkitgtk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index e4c6afce8a61..b0adcfbaea04 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -78,7 +78,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "webkitgtk";
-  version = "2.46.1";
+  version = "2.46.2";
   name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "6.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}";
 
   outputs = [ "out" "dev" "devdoc" ];
@@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
-    hash = "sha256-KhT6rDWa/5QdC8REPrVTfjcCvK8xawoSng5l8/+OqsA=";
+    hash = "sha256-Wq4cXAow1enFgxZStvG978MddeCtgctAGFsK7ZLOebY=";
   };
 
   patches = lib.optionals stdenv.hostPlatform.isLinux [

From 3cbe78a60a938a0129767f00b4b2f510e42979bb Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Tue, 22 Oct 2024 22:21:19 +0800
Subject: [PATCH 11/59] webkitgtk: Build with clang

The recommendation comes from upstream Skia.
---
 .../libraries/webkitgtk/default.nix           | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index b0adcfbaea04..4636921d60e1 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -1,5 +1,5 @@
 { lib
-, stdenv
+, clangStdenv
 , buildPackages
 , runCommand
 , fetchurl
@@ -72,11 +72,12 @@
 , enableGeoLocation ? true
 , enableExperimental ? false
 , withLibsecret ? true
-, systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd
+, systemdSupport ? lib.meta.availableOn clangStdenv.hostPlatform systemd
 , testers
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+# https://webkitgtk.org/2024/10/04/webkitgtk-2.46.html recommends building with clang.
+clangStdenv.mkDerivation (finalAttrs: {
   pname = "webkitgtk";
   version = "2.46.2";
   name = "${finalAttrs.pname}-${finalAttrs.version}+abi=${if lib.versionAtLeast gtk3.version "4.0" then "6.0" else "4.${if lib.versions.major libsoup.version == "2" then "0" else "1"}"}";
@@ -85,14 +86,14 @@ stdenv.mkDerivation (finalAttrs: {
 
   # https://github.com/NixOS/nixpkgs/issues/153528
   # Can't be linked within a 4GB address space.
-  separateDebugInfo = stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.is32bit;
+  separateDebugInfo = clangStdenv.hostPlatform.isLinux && !clangStdenv.hostPlatform.is32bit;
 
   src = fetchurl {
     url = "https://webkitgtk.org/releases/webkitgtk-${finalAttrs.version}.tar.xz";
     hash = "sha256-Wq4cXAow1enFgxZStvG978MddeCtgctAGFsK7ZLOebY=";
   };
 
-  patches = lib.optionals stdenv.hostPlatform.isLinux [
+  patches = lib.optionals clangStdenv.hostPlatform.isLinux [
     (substituteAll {
       src = ./fix-bubblewrap-paths.patch;
       inherit (builtins) storeDir;
@@ -100,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+  preConfigure = lib.optionalString (clangStdenv.hostPlatform != clangStdenv.buildPlatform) ''
     # Ignore gettext in cmake_prefix_path so that find_program doesn't
     # pick up the wrong gettext. TODO: Find a better solution for
     # this, maybe make cmake not look up executables in
@@ -123,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: {
     gi-docgen
     glib # for gdbus-codegen
     unifdef
-  ] ++ lib.optionals stdenv.hostPlatform.isLinux [
+  ] ++ lib.optionals clangStdenv.hostPlatform.isLinux [
     wayland-scanner
   ];
 
@@ -159,14 +160,14 @@ stdenv.mkDerivation (finalAttrs: {
     p11-kit
     sqlite
     woff2
-  ] ++ lib.optionals stdenv.hostPlatform.isBigEndian [
+  ] ++ lib.optionals clangStdenv.hostPlatform.isBigEndian [
     # https://bugs.webkit.org/show_bug.cgi?id=274032
     fontconfig
     freetype
-  ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+  ] ++ lib.optionals clangStdenv.hostPlatform.isDarwin [
     libedit
     readline
-  ] ++ lib.optional (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "11.0") (
+  ] ++ lib.optional (clangStdenv.hostPlatform.isDarwin && lib.versionOlder clangStdenv.hostPlatform.darwinSdkVersion "11.0") (
     # this can likely be removed as:
     # "libproc.h is included in the 10.12 SDK Libsystem and should be identical to this one."
     # but the package is marked broken on darwin so unable to test
@@ -178,7 +179,7 @@ stdenv.mkDerivation (finalAttrs: {
     runCommand "webkitgtk_headers" { } ''
       install -Dm444 "${lib.getDev apple_sdk.sdk}"/include/libproc.h "$out"/include/libproc.h
     ''
-  ) ++ lib.optionals stdenv.hostPlatform.isLinux [
+  ) ++ lib.optionals clangStdenv.hostPlatform.isLinux [
     libseccomp
     libmanette
     wayland
@@ -211,12 +212,12 @@ stdenv.mkDerivation (finalAttrs: {
       "-DUSE_SOUP2=${cmakeBool (lib.versions.major libsoup.version == "2")}"
       "-DUSE_LIBSECRET=${cmakeBool withLibsecret}"
       "-DENABLE_EXPERIMENTAL_FEATURES=${cmakeBool enableExperimental}"
-    ] ++ lib.optionals stdenv.hostPlatform.isLinux [
+    ] ++ lib.optionals clangStdenv.hostPlatform.isLinux [
       # Have to be explicitly specified when cross.
       # https://github.com/WebKit/WebKit/commit/a84036c6d1d66d723f217a4c29eee76f2039a353
       "-DBWRAP_EXECUTABLE=${lib.getExe bubblewrap}"
       "-DDBUS_PROXY_EXECUTABLE=${lib.getExe xdg-dbus-proxy}"
-    ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    ] ++ lib.optionals clangStdenv.hostPlatform.isDarwin [
       "-DENABLE_GAMEPAD=OFF"
       "-DENABLE_GTKDOC=OFF"
       "-DENABLE_MINIBROWSER=OFF"
@@ -255,6 +256,6 @@ stdenv.mkDerivation (finalAttrs: {
     ];
     platforms = platforms.linux ++ platforms.darwin;
     maintainers = teams.gnome.members;
-    broken = stdenv.hostPlatform.isDarwin;
+    broken = clangStdenv.hostPlatform.isDarwin;
   };
 })

From a7503e67f3d188f67f827790e14f540a67c4752e Mon Sep 17 00:00:00 2001
From: Samuel Tardieu <sam@rfc1149.net>
Date: Sun, 20 Oct 2024 13:42:26 +0200
Subject: [PATCH 12/59] =?UTF-8?q?synfigstudio:=201.5.1=20=E2=86=92=201.5.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../graphics/synfigstudio/default.nix          | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix
index 128d10295e5f..79ad559a5f38 100644
--- a/pkgs/applications/graphics/synfigstudio/default.nix
+++ b/pkgs/applications/graphics/synfigstudio/default.nix
@@ -1,7 +1,6 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, fetchpatch
 , pkg-config
 , autoreconfHook
 , wrapGAppsHook3
@@ -29,12 +28,12 @@
 }:
 
 let
-  version = "1.5.1";
+  version = "1.5.3";
   src = fetchFromGitHub {
     owner = "synfig";
     repo = "synfig";
     rev = "v${version}";
-    hash = "sha256-9vBYESaSgW/1FWH2uFBvPiYvxLlX0LLNnd4S7ACJcwI=";
+    hash = "sha256-D+FUEyzJ74l0USq3V9HIRAfgyJfRP372aEKDqF8+hsQ=";
   };
 
   ETL = stdenv.mkDerivation {
@@ -56,17 +55,6 @@ let
     pname = "synfig";
     inherit version src;
 
-    patches = [
-      # Pull upstream fix for autoconf-2.72 support:
-      #   https://github.com/synfig/synfig/pull/2930
-      (fetchpatch {
-        name = "autoconf-2.72.patch";
-        url = "https://github.com/synfig/synfig/commit/80a3386c701049f597cf3642bb924d2ff832ae05.patch";
-        stripLen = 1;
-        hash = "sha256-7gX8tJCR81gw8ZDyNYa8UaeZFNOx4o1Lnq0cAcaKb2I=";
-      })
-    ];
-
     sourceRoot = "${src.name}/synfig-core";
 
     configureFlags = [
@@ -161,7 +149,7 @@ stdenv.mkDerivation {
   meta = with lib; {
     description = "2D animation program";
     homepage = "http://www.synfig.org";
-    license = licenses.gpl2Plus;
+    license = licenses.gpl3Plus;
     maintainers = [ ];
     platforms = platforms.linux ++ platforms.darwin;
   };

From 030fc6a597d1bc24cb4d8bcc6076e2d11debcec4 Mon Sep 17 00:00:00 2001
From: SomeoneSerge <else+aalto@someonex.net>
Date: Fri, 25 Oct 2024 14:28:41 +0000
Subject: [PATCH 13/59] python312Packages.pytorch3d: init at 0.7.8

Bootstrapped with nix-init and built with cudaSupport=true.
Yet to run any tests beyond pythonImportsCheck
---
 .../python-modules/pytorch3d/default.nix      | 58 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 60 insertions(+)
 create mode 100644 pkgs/development/python-modules/pytorch3d/default.nix

diff --git a/pkgs/development/python-modules/pytorch3d/default.nix b/pkgs/development/python-modules/pytorch3d/default.nix
new file mode 100644
index 000000000000..1a9151591863
--- /dev/null
+++ b/pkgs/development/python-modules/pytorch3d/default.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  wheel,
+  torch,
+  iopath,
+  cudaPackages,
+  config,
+  cudaSupport ? config.cudaSupport,
+}:
+
+assert cudaSupport -> torch.cudaSupport;
+
+buildPythonPackage rec {
+  pname = "pytorch3d";
+  version = "0.7.8";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "facebookresearch";
+    repo = "pytorch3d";
+    rev = "V${version}";
+    hash = "sha256-DEEWWfjwjuXGc0WQInDTmtnWSIDUifyByxdg7hpdHlo=";
+  };
+
+  nativeBuildInputs = lib.optionals cudaSupport [ cudaPackages.cuda_nvcc ];
+  build-system = [
+    setuptools
+    wheel
+  ];
+  dependencies = [
+    torch
+    iopath
+  ];
+  buildInputs = [ (lib.getOutput "cxxdev" torch) ];
+
+  env =
+    {
+      FORCE_CUDA = cudaSupport;
+    }
+    // lib.optionalAttrs cudaSupport {
+      TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep ";" torch.cudaCapabilities}";
+    };
+
+  pythonImportsCheck = [ "pytorch3d" ];
+
+  meta = {
+    description = "FAIR's library of reusable components for deep learning with 3D data";
+    homepage = "https://github.com/facebookresearch/pytorch3d";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [
+      pbsds
+      SomeoneSerge
+    ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c09180a5bd4b..8d5c14269ca5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10467,6 +10467,8 @@ self: super: with self; {
 
   pytomorrowio = callPackage ../development/python-modules/pytomorrowio { };
 
+  pytorch3d = callPackage ../development/python-modules/pytorch3d { };
+
   pytouchlinesl = callPackage ../development/python-modules/pytouchlinesl { };
 
   pyuca = callPackage ../development/python-modules/pyuca { };

From 08f5ff787f73f1d8acd9dce3331caa6e273b0670 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 25 Oct 2024 16:37:04 +0000
Subject: [PATCH 14/59] python312Packages.pytorch3d: test cuda

---
 .../python-modules/pytorch3d/default.nix            | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/development/python-modules/pytorch3d/default.nix b/pkgs/development/python-modules/pytorch3d/default.nix
index 1a9151591863..2a92a51ec8bf 100644
--- a/pkgs/development/python-modules/pytorch3d/default.nix
+++ b/pkgs/development/python-modules/pytorch3d/default.nix
@@ -46,6 +46,19 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "pytorch3d" ];
 
+  passthru.tests.rotations-cuda =
+    cudaPackages.writeGpuTestPython { libraries = ps: [ ps.pytorch3d ]; }
+      ''
+        import pytorch3d.transforms as p3dt
+
+        M = p3dt.random_rotations(n=10, device="cuda")
+        assert "cuda" in M.device.type
+        angles = p3dt.matrix_to_euler_angles(M, "XYZ")
+        assert "cuda" in angles.device.type
+        assert angles.shape == (10, 3), angles.shape
+        print(angles)
+      '';
+
   meta = {
     description = "FAIR's library of reusable components for deep learning with 3D data";
     homepage = "https://github.com/facebookresearch/pytorch3d";

From e7a0b152a6e2d73d05c04341dc1a9f44453afc30 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Mon, 28 Oct 2024 10:27:42 -0400
Subject: [PATCH 15/59] sv-lang: fix cross compilation

---
 pkgs/applications/science/electronics/sv-lang/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/electronics/sv-lang/default.nix b/pkgs/applications/science/electronics/sv-lang/default.nix
index 928cf3059385..2bc5059b8b80 100644
--- a/pkgs/applications/science/electronics/sv-lang/default.nix
+++ b/pkgs/applications/science/electronics/sv-lang/default.nix
@@ -49,15 +49,14 @@ stdenv.mkDerivation rec {
     cmake
     python3
     ninja
-
-    # though only used in tests, cmake will complain its absence when configuring
-    catch2_3
   ];
 
   buildInputs = [
     unordered_dense
     boost182
     fmt_9
+    # though only used in tests, cmake will complain its absence when configuring
+    catch2_3
   ];
 
   # TODO: a mysterious linker error occurs when building the unittests on darwin.

From 320122395bdb7d3530acdce26e308f7555371cd0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 29 Oct 2024 13:26:44 +0000
Subject: [PATCH 16/59] avro-tools: 1.11.3 -> 1.12.0

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

diff --git a/pkgs/by-name/av/avro-tools/package.nix b/pkgs/by-name/av/avro-tools/package.nix
index 730a05a259e8..b4d831af3bf4 100644
--- a/pkgs/by-name/av/avro-tools/package.nix
+++ b/pkgs/by-name/av/avro-tools/package.nix
@@ -7,14 +7,14 @@
 }:
 let
   pname = "avro-tools";
-  version = "1.11.3";
+  version = "1.12.0";
 in
 stdenv.mkDerivation {
   inherit pname version;
 
   src = fetchurl {
     url = "mirror://maven/org/apache/avro/avro-tools/${version}/${pname}-${version}.jar";
-    sha256 = "sha256-dPaV1rZxxE+G/gB7hEDyiMI7ZbzkTpNEtexp/Y6hrPI=";
+    sha256 = "sha256-+OTQ2UWFLcL5HDv4j33LjKvADg/ClbuS6JPlSUXggIU=";
   };
 
   dontUnpack = true;

From 199e197bf9451cdb83a5c55e32d0cbba5fcb69b4 Mon Sep 17 00:00:00 2001
From: Paul Meyer <49727155+katexochen@users.noreply.github.com>
Date: Tue, 29 Oct 2024 16:52:11 +0100
Subject: [PATCH 17/59] athens: 0.15.3 -> 0.15.4

Signed-off-by: Paul Meyer <49727155+katexochen@users.noreply.github.com>
---
 pkgs/by-name/at/athens/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/at/athens/package.nix b/pkgs/by-name/at/athens/package.nix
index 4b4958c643b7..21acfc9f37d6 100644
--- a/pkgs/by-name/at/athens/package.nix
+++ b/pkgs/by-name/at/athens/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "athens";
-  version = "0.15.3";
+  version = "0.15.4";
 
   src = fetchFromGitHub {
     owner = "gomods";
     repo = "athens";
     rev = "v${version}";
-    hash = "sha256-iRuy3z5GCsuTnIQuPkzyTvMSMlYTqf3Do7uqgERTXn0=";
+    hash = "sha256-6NBdif8rQ1aj4nTYXhrWyErzRv0q8WpIheRnb2FCnkU=";
   };
 
-  vendorHash = "sha256-cK23BIGh/BK1OHHrI++PD1h7lCN7NZfV1Yfirs8vC5A=";
+  vendorHash = "sha256-W65lQYGrRg8LwFERj5MBOPFAn2j+FE7ep4ANuAGmfgM=";
 
   CGO_ENABLED = "0";
   ldflags = [

From 67322fabac7b2f19b8fd04ef46ec1aeada7fb270 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 29 Oct 2024 16:15:38 +0000
Subject: [PATCH 18/59] cargo-tally: 1.0.48 -> 1.0.50

---
 pkgs/development/tools/rust/cargo-tally/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-tally/default.nix b/pkgs/development/tools/rust/cargo-tally/default.nix
index b85112f75538..92127031c8a5 100644
--- a/pkgs/development/tools/rust/cargo-tally/default.nix
+++ b/pkgs/development/tools/rust/cargo-tally/default.nix
@@ -2,14 +2,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-tally";
-  version = "1.0.48";
+  version = "1.0.50";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-BrWJKM7Vkvjlkn3PCBe45epQc2SkjKVlttQF0/AHSls=";
+    hash = "sha256-kU2SmD51enAyRzzpPJunMKloKS1m7zwEqk2kMX94s7U=";
   };
 
-  cargoHash = "sha256-Dkz3QJchUAn4/kQsmQcSfxVrRdiCA2qJSOTszfvE4No=";
+  cargoHash = "sha256-tWMiAb50znyZS77Qcp5dUjPr7qnODjiEFunIyDOde8s=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (with darwin.apple_sdk_11_0.frameworks; [
     DiskArbitration

From 0d071e65240e1a01f0dfbc508627792724e3c80e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 29 Oct 2024 17:00:05 +0000
Subject: [PATCH 19/59] python312Packages.lifelines: 0.29.0 -> 0.30.0

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

diff --git a/pkgs/development/python-modules/lifelines/default.nix b/pkgs/development/python-modules/lifelines/default.nix
index ec823cf5fbf4..1543ce87a885 100644
--- a/pkgs/development/python-modules/lifelines/default.nix
+++ b/pkgs/development/python-modules/lifelines/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "lifelines";
-  version = "0.29.0";
+  version = "0.30.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.9";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "CamDavidsonPilon";
     repo = "lifelines";
     rev = "refs/tags/v${version}";
-    hash = "sha256-9ZmecbFjUnWGNf4P3yphiMqG+/ktOYyvMtoZ6sEp1xY=";
+    hash = "sha256-rbt0eON8Az5jDvj97RDn3ppWyjbrSa/xumbwhq21g6g=";
   };
 
   propagatedBuildInputs = [

From 5dc9d879f8176410c8ed72c907b22c2236a3a6c3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 29 Oct 2024 18:19:42 +0000
Subject: [PATCH 20/59] fzf-make: 0.36.0 -> 0.37.0

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

diff --git a/pkgs/by-name/fz/fzf-make/package.nix b/pkgs/by-name/fz/fzf-make/package.nix
index 0dd3feaa7caf..4e0bd6de84a2 100644
--- a/pkgs/by-name/fz/fzf-make/package.nix
+++ b/pkgs/by-name/fz/fzf-make/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "fzf-make";
-  version = "0.36.0";
+  version = "0.37.0";
 
   src = fetchFromGitHub {
     owner = "kyu08";
     repo = "fzf-make";
     rev = "v${version}";
-    hash = "sha256-IlPkJK4pYszrJ43HSTq9Xwpz3K9XnUpoF0Ry7ox85KE=";
+    hash = "sha256-msSiVlz6Aey8Q+NjtKl58TOkYtPIzw3733kVGs9/8UQ=";
   };
 
-  cargoHash = "sha256-mMDPpiIWhGMl0a4v1msNfcQqmq5ziB+ppw7RxYNAPaI=";
+  cargoHash = "sha256-q67UAAVvc070eArfMo4r/UcUUjODuR/vMukiA4ylQ5w=";
 
   nativeBuildInputs = [ makeBinaryWrapper ];
 

From 8024d6715d9f2319e8e77ed4dbd57c6070963714 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Tue, 29 Oct 2024 19:49:24 +0100
Subject: [PATCH 21/59] tor-browser: 14.0 -> 14.0.1

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/by-name/to/tor-browser/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix
index e0d96106f792..cdda6d6b9d57 100644
--- a/pkgs/by-name/to/tor-browser/package.nix
+++ b/pkgs/by-name/to/tor-browser/package.nix
@@ -102,7 +102,7 @@ lib.warnIf (useHardenedMalloc != null)
       ++ lib.optionals mediaSupport [ ffmpeg ]
   );
 
-  version = "14.0";
+  version = "14.0.1";
 
   sources = {
     x86_64-linux = fetchurl {
@@ -112,7 +112,7 @@ lib.warnIf (useHardenedMalloc != null)
         "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
         "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
       ];
-      hash = "sha256-RNsTj8/HP10ElIjutYCqp50gN7W7Kz+DA94rkkU/VaI=";
+      hash = "sha256-DQbKMaXgEXNKHPonQF7RZ1TtEqCRnvD81ahyVUkknY8=";
     };
 
     i686-linux = fetchurl {
@@ -122,7 +122,7 @@ lib.warnIf (useHardenedMalloc != null)
         "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
         "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
       ];
-      hash = "sha256-rHInikR2UvsB8A0cC7gqj09CWajJtR9ZhS3WFrv2z94=";
+      hash = "sha256-khY/B4c0DjqRd0s9PblEhL0jJONVU5mQCAqZ60M+CjE=";
     };
   };
 

From 2ee0e1be707b26851312596c775df0198ae12b84 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 29 Oct 2024 21:20:58 +0100
Subject: [PATCH 22/59] apko: 0.19.1 -> 0.19.6

https://github.com/chainguard-dev/apko/releases/tag/v0.19.6

https://github.com/chainguard-dev/apko/releases/tag/v0.19.5

https://github.com/chainguard-dev/apko/releases/tag/v0.19.4

https://github.com/chainguard-dev/apko/releases/tag/v0.19.3

https://github.com/chainguard-dev/apko/releases/tag/v0.19.2

diff: https://github.com/chainguard-dev/apko/compare/v0.19.1...v0.19.6
---
 pkgs/development/tools/apko/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/apko/default.nix b/pkgs/development/tools/apko/default.nix
index 6248c08360df..cb8d4f2eafac 100644
--- a/pkgs/development/tools/apko/default.nix
+++ b/pkgs/development/tools/apko/default.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "apko";
-  version = "0.19.1";
+  version = "0.19.6";
 
   src = fetchFromGitHub {
     owner = "chainguard-dev";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-uUsNYQPW2MtXxohdenXbNWfikp8TW0chJ5SDYU8ayV4=";
+    hash = "sha256-zcAV+6GdytdUsVxJCNIhfeVGjWFZ2/mgmwpIXTFLEhk=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -24,7 +24,7 @@ buildGoModule rec {
       find "$out" -name .git -print0 | xargs -0 rm -rf
     '';
   };
-  vendorHash = "sha256-2Tuhya70R++Nv5KEd+4vjxiTTansraSXQtGm/FqRktk=";
+  vendorHash = "sha256-vQjsKQ49ksea5GZXEd7XjGkN0IoW2HQekyQL5fmwCTc=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 5c750ede24b2807f1b63e9542b25526c87e70c52 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Tue, 29 Oct 2024 22:31:50 +0000
Subject: [PATCH 23/59] openrefine: 3.8.2 -> 3.8.5

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

diff --git a/pkgs/applications/science/misc/openrefine/default.nix b/pkgs/applications/science/misc/openrefine/default.nix
index 60615b6f0926..78d312c4011e 100644
--- a/pkgs/applications/science/misc/openrefine/default.nix
+++ b/pkgs/applications/science/misc/openrefine/default.nix
@@ -10,12 +10,12 @@
 }:
 
 let
-  version = "3.8.2";
+  version = "3.8.5";
   src = fetchFromGitHub {
     owner = "openrefine";
     repo = "openrefine";
     rev = version;
-    hash = "sha256-3KCO9ooYN8PPVirU2wh7wu4feHqugc3JSXWR2aWIanE=";
+    hash = "sha256-8QAnZCvSUMuRj/Rd85j79GXDQxl8HlEaiU4StsXDdpU=";
   };
 
   npmPkg = buildNpmPackage {
@@ -53,7 +53,7 @@ in maven.buildMavenPackage {
 
   mvnJdk = jdk;
   mvnParameters = "-pl !packaging";
-  mvnHash = "sha256-AuZp+uq5bmb4gnzKvqXeTmBrsCT6qmJOrwtJq9iCkRQ=";
+  mvnHash = "sha256-SrEsJfiZrPy2zZ0Vzl7+d+8XUHGd2DOOs+PHBOZrbIU=";
 
   nativeBuildInputs = [ makeWrapper ];
 

From 23840b2afc99bbbf2dfc4928f931a9ce6d871d17 Mon Sep 17 00:00:00 2001
From: Theodore Ni <3806110+tjni@users.noreply.github.com>
Date: Tue, 29 Oct 2024 16:30:57 -0700
Subject: [PATCH 24/59] python312Packages.dbt-core: relax dbt-common dependency

Plus, update the supported Python version to 3.9+, following upstream.
---
 pkgs/development/python-modules/dbt-core/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/dbt-core/default.nix b/pkgs/development/python-modules/dbt-core/default.nix
index 1174274e3a98..005729a7c55d 100644
--- a/pkgs/development/python-modules/dbt-core/default.nix
+++ b/pkgs/development/python-modules/dbt-core/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   version = "1.8.8";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.9";
 
   src = fetchFromGitHub {
     owner = "dbt-labs";
@@ -47,6 +47,7 @@ buildPythonPackage rec {
     "protobuf"
     "agate"
     "click"
+    "dbt-common"
     "dbt-semantic-interfaces"
     "mashumaro"
     "networkx"

From 8437a40fc274d820b0efb76ca1c959ac290b0004 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Tue, 29 Oct 2024 21:14:08 -0300
Subject: [PATCH 25/59] marwaita-orange: 21 -> 22

Diff: https://github.com/darkomarko42/marwaita-orange/compare/21...22
---
 pkgs/by-name/ma/marwaita-orange/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/marwaita-orange/package.nix b/pkgs/by-name/ma/marwaita-orange/package.nix
index 16de4362c4fd..e12c9f501076 100644
--- a/pkgs/by-name/ma/marwaita-orange/package.nix
+++ b/pkgs/by-name/ma/marwaita-orange/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "marwaita-orange";
-  version = "21";
+  version = "22";
 
   src = fetchFromGitHub {
     owner = "darkomarko42";
     repo = pname;
     rev = version;
-    hash = "sha256-LJvlbvbgNH5nnfDAG8BpOBrO2W6VyDeH2yDcjRamUQI=";
+    hash = "sha256-hp+5UIr3uXuUay3K6HsaGs+Wh9VFx1yVNb3d0Jw2M34=";
   };
 
   buildInputs = [

From df207b5eb72c25c78a404bf61daa0a5f70039b82 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 30 Oct 2024 00:22:26 +0000
Subject: [PATCH 26/59] rpcs3: 0.0.33-16999-938306a7b -> 0.0.33-17070-8b8396b94

---
 pkgs/by-name/rp/rpcs3/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix
index 12942225207d..deaeac82bda8 100644
--- a/pkgs/by-name/rp/rpcs3/package.nix
+++ b/pkgs/by-name/rp/rpcs3/package.nix
@@ -33,10 +33,10 @@
 
 let
   # Keep these separate so the update script can regex them
-  rpcs3GitVersion = "16999-938306a7b";
-  rpcs3Version = "0.0.33-16999-938306a7b";
-  rpcs3Revision = "938306a7bc86edd0dfdd995d28e818f36240bf8f";
-  rpcs3Hash = "sha256-5XufzJ3LmhBpLiIscIW3KBgj/R9aSDD5zFiBo/D+p34=";
+  rpcs3GitVersion = "17070-8b8396b94";
+  rpcs3Version = "0.0.33-17070-8b8396b94";
+  rpcs3Revision = "8b8396b9455394486656660c960d420c5b6c446c";
+  rpcs3Hash = "sha256-LUgKUzoBNY4ZemRBsLOjtXxLXHyRkPivtdSSgUGw5h4=";
 
   inherit (qt6Packages) qtbase qtmultimedia wrapQtAppsHook qtwayland;
 in

From a4d13468110d819b1e535f795514cf12efdf3b3c Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Tue, 29 Oct 2024 20:40:34 -0400
Subject: [PATCH 27/59] k0sctl: 0.19.1 -> 0.19.2

Diff: https://github.com/k0sproject/k0sctl/compare/refs/tags/v0.19.1...v0.19.2

Changelog: https://github.com/k0sproject/k0sctl/releases/tag/v0.19.2
---
 pkgs/applications/networking/cluster/k0sctl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/k0sctl/default.nix b/pkgs/applications/networking/cluster/k0sctl/default.nix
index 7c7fdbf248a4..f22d0b97e5f5 100644
--- a/pkgs/applications/networking/cluster/k0sctl/default.nix
+++ b/pkgs/applications/networking/cluster/k0sctl/default.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "k0sctl";
-  version = "0.19.1";
+  version = "0.19.2";
 
   src = fetchFromGitHub {
     owner = "k0sproject";
     repo = "k0sctl";
     rev = "refs/tags/v${version}";
-    hash = "sha256-6mvSVbSTPFiAIDxNQUmgFmS+3v3RUh10Y552u9bHOn0=";
+    hash = "sha256-TdnZZ27j++o9I4Zup4PmM2VAHwn8BPBG/CwxTUy0BWU=";
   };
 
   vendorHash = "sha256-Hl/eSFbwFiuSaaPh5blWFfz6m4VNrS5mYL8ehQlb90I=";

From fdaa4fc5a8a81690e8c09f08d1053bc1794e4684 Mon Sep 17 00:00:00 2001
From: Bryan Gardiner <bog@khumba.net>
Date: Wed, 16 Oct 2024 17:54:58 -0700
Subject: [PATCH 28/59] system76-dkms: 1.0.13 -> 1.0.16

The latest release adds a small compatibility fix needed for Linux 6.11.
---
 pkgs/os-specific/linux/system76/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/system76/default.nix b/pkgs/os-specific/linux/system76/default.nix
index 7d9cd9bde024..e6626ff6b5be 100644
--- a/pkgs/os-specific/linux/system76/default.nix
+++ b/pkgs/os-specific/linux/system76/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub, kernel }:
 let
-  version = "1.0.13";
-  sha256 = "162hhmnww8z9k0795ffs8v3f61hlfm375law156sk5l08if19a4r";
+  version = "1.0.16";
+  sha256 = "sha256-jsBLy5WDl2l8o/2ccIk1XMqOukeDX5eZ+VH5Dyo5BaA=";
 in
 stdenv.mkDerivation {
   name = "system76-module-${version}-${kernel.version}";

From 7c1d037fb15708bda50605fddde453d2c34b865b Mon Sep 17 00:00:00 2001
From: Bryan Gardiner <bog@khumba.net>
Date: Tue, 29 Oct 2024 18:01:54 -0700
Subject: [PATCH 29/59] system76-dkms: style improvements

---
 pkgs/os-specific/linux/system76/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/system76/default.nix b/pkgs/os-specific/linux/system76/default.nix
index e6626ff6b5be..b42b31c5a214 100644
--- a/pkgs/os-specific/linux/system76/default.nix
+++ b/pkgs/os-specific/linux/system76/default.nix
@@ -1,7 +1,7 @@
 { lib, stdenv, fetchFromGitHub, kernel }:
 let
   version = "1.0.16";
-  sha256 = "sha256-jsBLy5WDl2l8o/2ccIk1XMqOukeDX5eZ+VH5Dyo5BaA=";
+  hash = "sha256-jsBLy5WDl2l8o/2ccIk1XMqOukeDX5eZ+VH5Dyo5BaA=";
 in
 stdenv.mkDerivation {
   name = "system76-module-${version}-${kernel.version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
     owner = "pop-os";
     repo = "system76-dkms";
     rev = version;
-    inherit sha256;
+    inherit hash;
   };
 
   hardeningDisable = [ "pic" ];
@@ -29,11 +29,10 @@ stdenv.mkDerivation {
     mv lib/udev/hwdb.d/* $out/lib/udev/hwdb.d
   '';
 
-  meta = with lib; {
-    maintainers = [ maintainers.khumba ];
-    license = [ licenses.gpl2Plus ];
+  meta = {
+    maintainers = [ lib.maintainers.khumba ];
+    license = [ lib.licenses.gpl2Plus ];
     platforms = [ "i686-linux" "x86_64-linux" ];
-    broken = versionOlder kernel.version "4.14";
     description = "System76 DKMS driver";
     homepage = "https://github.com/pop-os/system76-dkms";
     longDescription = ''

From b4b9af9e0df1fde47c80c1728bd86ab159a70d1c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 30 Oct 2024 01:48:00 +0000
Subject: [PATCH 30/59] aiac: 5.2.1 -> 5.3.0

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

diff --git a/pkgs/applications/networking/cluster/aiac/default.nix b/pkgs/applications/networking/cluster/aiac/default.nix
index ac1d51ecee3a..ab03b5dac0c6 100644
--- a/pkgs/applications/networking/cluster/aiac/default.nix
+++ b/pkgs/applications/networking/cluster/aiac/default.nix
@@ -2,14 +2,14 @@
 
 buildGoModule rec {
   pname = "aiac";
-  version = "5.2.1";
+  version = "5.3.0";
   excludedPackages = [".ci"];
 
   src = fetchFromGitHub {
     owner = "gofireflyio";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-8LMuhUeH/KNOf3IPYMSwZDxeY8M7oDYF4Q7X7ImQSMw=";
+    hash = "sha256-Lk3Bmzg1owkIWzz7jgq1YpdPyRzyZ7aNoWPIU5aWzu0=";
   };
 
   vendorHash = "sha256-uXYin6JITpy3bc7FI/3aJqvCD9cGwGL1qjB8hBUWLQE=";

From 688a2cda59ad46d564440b79117f7ba74126b110 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 30 Oct 2024 04:57:28 +0000
Subject: [PATCH 31/59] relic: 8.0.1 -> 8.1.0

---
 pkgs/development/tools/relic/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/relic/default.nix b/pkgs/development/tools/relic/default.nix
index 3a66444f345c..a191bc3dd7fc 100644
--- a/pkgs/development/tools/relic/default.nix
+++ b/pkgs/development/tools/relic/default.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "relic";
-  version = "8.0.1";
+  version = "8.1.0";
 
   src = fetchFromGitHub {
     owner = "sassoftware";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-w7KU3XntkKep0mcuOUBSG4fJW14yCamioeRH5YrULSo=";
+    sha256 = "sha256-jBE23kGrU/q53ZTVoQ9xmeL+rVuSneObbCRqEa/zvpI=";
   };
 
-  vendorHash = "sha256-/P4W+smY01feV1HP5Tsx0PsoOyp//ik7RVWuEaiSepY=";
+  vendorHash = "sha256-x0EqKotZJny+7FtRvdXWUkPpG0jntFGe/IpNzKVL2pI=";
 
   ldflags = [
     "-s"

From 52b21a718a86c005ca237fc1f27c3b1820f8f421 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 30 Oct 2024 05:22:45 +0000
Subject: [PATCH 32/59] python312Packages.avwx-engine: 1.9.0 -> 1.9.1

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

diff --git a/pkgs/development/python-modules/avwx-engine/default.nix b/pkgs/development/python-modules/avwx-engine/default.nix
index 808530221781..aaae9c534eb7 100644
--- a/pkgs/development/python-modules/avwx-engine/default.nix
+++ b/pkgs/development/python-modules/avwx-engine/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "avwx-engine";
-  version = "1.9.0";
+  version = "1.9.1";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "avwx-rest";
     repo = "avwx-engine";
     rev = "refs/tags/${version}";
-    hash = "sha256-CUnUz2SsXtWaqGzaB1PH+EoHqebSue6e8GXhRZRcXLs=";
+    hash = "sha256-gDhZlrxiIyj15nxMBFFzuCAHtkDfqYowDZc5g4pQ+i8=";
   };
 
   build-system = [ hatchling ];

From 00810015c1052801e35d9e27fa1a86ae9571febf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 30 Oct 2024 05:47:15 +0000
Subject: [PATCH 33/59] python312Packages.mdformat-mkdocs: 3.0.0 -> 3.0.1

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

diff --git a/pkgs/development/python-modules/mdformat-mkdocs/default.nix b/pkgs/development/python-modules/mdformat-mkdocs/default.nix
index d7cf61de83b7..91b5772901db 100644
--- a/pkgs/development/python-modules/mdformat-mkdocs/default.nix
+++ b/pkgs/development/python-modules/mdformat-mkdocs/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "mdformat-mkdocs";
-  version = "3.0.0";
+  version = "3.0.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "KyleKing";
     repo = "mdformat-mkdocs";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Af15Xs8K/QSeIxQNgi1n8xZ+SyyzNs5JL3wse0+LoyE=";
+    hash = "sha256-MO/YMvvpsEarc8CjELByHUqR5xFtYqhkKkJrFy0PNvU=";
   };
 
   nativeBuildInputs = [ flit-core ];

From 6d361a29f05d027e8a0462921c8c7ae39a5bcffa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 30 Oct 2024 06:54:12 +0000
Subject: [PATCH 34/59] ginkgo: 2.20.2 -> 2.21.0

---
 pkgs/development/tools/ginkgo/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/ginkgo/default.nix b/pkgs/development/tools/ginkgo/default.nix
index 4584650436c2..06a4c36a7d9f 100644
--- a/pkgs/development/tools/ginkgo/default.nix
+++ b/pkgs/development/tools/ginkgo/default.nix
@@ -2,15 +2,15 @@
 
 buildGoModule rec {
   pname = "ginkgo";
-  version = "2.20.2";
+  version = "2.21.0";
 
   src = fetchFromGitHub {
     owner = "onsi";
     repo = "ginkgo";
     rev = "v${version}";
-    sha256 = "sha256-/emP4U2s7/hYJZCJ+TdE5sM45q0C8OrrIFreSupq3ig=";
+    sha256 = "sha256-9WvBdcl65WTwzFKTPYTg6ufhIBuqx+T99ng7UePSNHU=";
   };
-  vendorHash = "sha256-6HlCj2Wq+lH6OQxG18fCMj1eC2Xy++IQx35nCAtHQ/U=";
+  vendorHash = "sha256-tjHBnkFlkP7n0/c9bz/nUzWerPzVQ+12cKijG1Jzti8=";
 
   # integration tests expect more file changes
   # types tests are missing CodeLocation

From df3927e29ea49604b7948ff8719890433a96141a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 30 Oct 2024 07:07:28 +0000
Subject: [PATCH 35/59] tpnote: 1.24.8 -> 1.24.9

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

diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix
index ea58c45f579b..91d03eb80a14 100644
--- a/pkgs/by-name/tp/tpnote/package.nix
+++ b/pkgs/by-name/tp/tpnote/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tpnote";
-  version = "1.24.8";
+  version = "1.24.9";
 
   src = fetchFromGitHub {
     owner = "getreu";
     repo = "tp-note";
     rev = "v${version}";
-    hash = "sha256-tn6GCBX3DrqyZZz2FJLTn1vJd4eEbawyJM5huco21/8=";
+    hash = "sha256-KXkriFFn1GapoVimcK7Hqv1mUTZ2EbnnZPyX2izI2oo=";
   };
 
-  cargoHash = "sha256-2qGObTu7g6GbUwd4obgqufig7bABFLBsCWSyZt8AVac=";
+  cargoHash = "sha256-MCnQJ1cJeWUJ8L+u09px4COG7XUAVOOgBg8nUi37J90=";
 
   nativeBuildInputs = [
     cmake

From 09e3d68113f4ecdbaae9a5418121876e6ed821c7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 30 Oct 2024 07:36:37 +0000
Subject: [PATCH 36/59] aardvark-dns: 1.12.2 -> 1.13.0

---
 pkgs/tools/networking/aardvark-dns/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/aardvark-dns/default.nix b/pkgs/tools/networking/aardvark-dns/default.nix
index 35d59d11feeb..2adbb0a73932 100644
--- a/pkgs/tools/networking/aardvark-dns/default.nix
+++ b/pkgs/tools/networking/aardvark-dns/default.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "aardvark-dns";
-  version = "1.12.2";
+  version = "1.13.0";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-1fYJ0G75sbg97HiN6HNWwlG82jqENqVTC/sXgH+oXWA=";
+    hash = "sha256-1I0YcnHGxblfSWlx5bbR4v3UXxKPnYQ90AKnUny2vDg=";
   };
 
-  cargoHash = "sha256-COZmd5sqaewK0La78/1J9bGJdsPNyeT18wV2qr/b6cM=";
+  cargoHash = "sha256-vZHFZL3dwFVyLfifpUq4uaqaUac7Itimf2pJGZ4qWMM=";
 
   passthru.tests = { inherit (nixosTests) podman; };
 

From 04fb46fd330f072415e731c1440475eba7db1205 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 30 Oct 2024 08:12:23 +0000
Subject: [PATCH 37/59] openvas-scanner: 23.9.0 -> 23.10.0

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

diff --git a/pkgs/by-name/op/openvas-scanner/package.nix b/pkgs/by-name/op/openvas-scanner/package.nix
index 38411adb4ea2..1ab75103433c 100644
--- a/pkgs/by-name/op/openvas-scanner/package.nix
+++ b/pkgs/by-name/op/openvas-scanner/package.nix
@@ -31,13 +31,13 @@
 
 stdenv.mkDerivation rec {
   pname = "openvas-scanner";
-  version = "23.9.0";
+  version = "23.10.0";
 
   src = fetchFromGitHub {
     owner = "greenbone";
     repo = "openvas-scanner";
     rev = "refs/tags/v${version}";
-    hash = "sha256-vdqIM0qkCpOjohmMP245Og87wOmejlCBEIceBfwEB8U=";
+    hash = "sha256-5eXw9buGln2of4wumPUFloguCvru9at4pUEb1FVYzoM=";
   };
 
   nativeBuildInputs = [

From 0e1a87a5b9b0eed75eee5c04ffbcffd067d69681 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 30 Oct 2024 09:52:05 +0100
Subject: [PATCH 38/59] go2rtc: 1.9.5 -> 1.9.6

Diff: https://github.com/AlexxIT/go2rtc/compare/refs/tags/v1.9.5...v1.9.6

Changelog: https://github.com/AlexxIT/go2rtc/releases/tag/v1.9.6
---
 pkgs/tools/video/go2rtc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/video/go2rtc/default.nix b/pkgs/tools/video/go2rtc/default.nix
index b81010bda27d..6c672837b1ad 100644
--- a/pkgs/tools/video/go2rtc/default.nix
+++ b/pkgs/tools/video/go2rtc/default.nix
@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "go2rtc";
-  version = "1.9.5";
+  version = "1.9.6";
 
   src = fetchFromGitHub {
     owner = "AlexxIT";
     repo = "go2rtc";
     rev = "refs/tags/v${version}";
-    hash = "sha256-avak2cc8KDmlTrQutzULuvkWxSgdv3rMI7+G3+jNcdI=";
+    hash = "sha256-Vq0w3JldUVUh4soULyWQI9D2yknkx529n4aAwhpdfdU=";
   };
 
   vendorHash = "sha256-N8aJmxNQ/p2ddJG9DuIVVjcgzEC6TzD0sz992h3q0RU=";

From 44028a41588f6b09c0f2fd7800d48d37fd181f18 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 30 Oct 2024 09:53:10 +0100
Subject: [PATCH 39/59] python312Packages.pytapo: 3.3.30 -> 3.3.32

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

diff --git a/pkgs/development/python-modules/pytapo/default.nix b/pkgs/development/python-modules/pytapo/default.nix
index 1cc1d8f5d180..7cec1417bfc8 100644
--- a/pkgs/development/python-modules/pytapo/default.nix
+++ b/pkgs/development/python-modules/pytapo/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pytapo";
-  version = "3.3.30";
+  version = "3.3.32";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-zSeDeGD/78bIoKm6B8BN4qWQE1ivNgyvnrGtgsekM3M=";
+    hash = "sha256-OYRcgX30O0/F+0H4x2jbPyVNh6xVeBSdfqbtuqUgoNE=";
   };
 
   build-system = [ setuptools ];

From 4c4b30e9556d58e61380f2e5aae79daff0c8a51f Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 17 Sep 2024 00:07:38 +0200
Subject: [PATCH 40/59] python312Packages.bitsandbytes: 0.43.1 -> 0.44.1

Diff:
https://github.com/TimDettmers/bitsandbytes/compare/refs/tags/0.43.1...0.44.1

Changelog:
https://github.com/TimDettmers/bitsandbytes/releases/tag/0.44.1
---
 .../python-modules/bitsandbytes/default.nix   | 103 ++++++++++--------
 1 file changed, 58 insertions(+), 45 deletions(-)

diff --git a/pkgs/development/python-modules/bitsandbytes/default.nix b/pkgs/development/python-modules/bitsandbytes/default.nix
index 9bfc4a89784f..90dde389144e 100644
--- a/pkgs/development/python-modules/bitsandbytes/default.nix
+++ b/pkgs/development/python-modules/bitsandbytes/default.nix
@@ -1,31 +1,34 @@
 {
   lib,
+  torch,
+  symlinkJoin,
   buildPythonPackage,
   fetchFromGitHub,
-  python,
-  pythonOlder,
+  cmake,
   setuptools,
-  wheel,
-  torch,
   scipy,
-  symlinkJoin,
 }:
 
 let
   pname = "bitsandbytes";
-  version = "0.43.1";
+  version = "0.44.1";
 
-  inherit (torch) cudaCapabilities cudaPackages cudaSupport;
-  inherit (cudaPackages) backendStdenv cudaVersion;
+  inherit (torch) cudaPackages cudaSupport;
+  inherit (cudaPackages) cudaVersion;
+
+  cudaVersionString = lib.replaceStrings [ "." ] [ "" ] (lib.versions.majorMinor cudaVersion);
 
   # NOTE: torchvision doesn't use cudnn; torch does!
   #   For this reason it is not included.
   cuda-common-redist = with cudaPackages; [
-    cuda_cccl # <thrust/*>
-    libcublas # cublas_v2.h
+    (lib.getDev cuda_cccl) # <thrust/*>
+    (lib.getDev libcublas) # cublas_v2.h
+    (lib.getLib libcublas)
     libcurand
     libcusolver # cusolverDn.h
-    libcusparse # cusparse.h
+    (lib.getDev libcusparse) # cusparse.h
+    (lib.getLib libcusparse) # cusparse.h
+    (lib.getDev cuda_cudart) # cuda_runtime.h cuda_runtime_api.h
   ];
 
   cuda-native-redist = symlinkJoin {
@@ -33,7 +36,9 @@ let
     paths =
       with cudaPackages;
       [
-        cuda_cudart # cuda_runtime.h cuda_runtime_api.h
+        (lib.getDev cuda_cudart) # cuda_runtime.h cuda_runtime_api.h
+        (lib.getLib cuda_cudart)
+        (lib.getStatic cuda_cudart)
         cuda_nvcc
       ]
       ++ cuda-common-redist;
@@ -48,47 +53,55 @@ buildPythonPackage {
   inherit pname version;
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "TimDettmers";
     repo = "bitsandbytes";
     rev = "refs/tags/${version}";
-    hash = "sha256-GFbFKPdV96DXPA+PZO4h0zdBclN670fb0PGv4QPHWHU=";
+    hash = "sha256-yvxD5ymMK5p4Xg7Csx/90mPV3yxUC6QUuF/8BKO2p0k=";
   };
 
-  postPatch =
-    ''
-      substituteInPlace Makefile --replace "/usr/bin/g++" "g++" --replace "lib64" "lib"
-      substituteInPlace bitsandbytes/cuda_setup/main.py  \
-        --replace "binary_path = package_dir / self.binary_name"  \
-                  "binary_path = Path('$out/${python.sitePackages}/${pname}')/self.binary_name"
-    ''
-    + lib.optionalString torch.cudaSupport ''
-      substituteInPlace bitsandbytes/cuda_setup/main.py  \
-        --replace "/usr/local/cuda/lib64" "${cuda-native-redist}/lib"
-    '';
-
-  CUDA_HOME = "${cuda-native-redist}";
-
-  preBuild =
-    if torch.cudaSupport then
-      with torch.cudaPackages;
-      let
-        cudaVersion = lib.concatStrings (lib.splitVersion torch.cudaPackages.cudaMajorMinorVersion);
-      in
-      ''make CUDA_VERSION=${cudaVersion} cuda${cudaMajorVersion}x''
-    else
-      ''make CUDA_VERSION=CPU cpuonly'';
+  # By default, which library is loaded depends on the result of `torch.cuda.is_available()`.
+  # When `cudaSupport` is enabled, bypass this check and load the cuda library unconditionnally.
+  # Indeed, in this case, only `libbitsandbytes_cuda124.so` is built. `libbitsandbytes_cpu.so` is not.
+  # Also, hardcode the path to the previously built library instead of relying on
+  # `get_cuda_bnb_library_path(cuda_specs)` which relies on `torch.cuda` too.
+  #
+  # WARNING: The cuda library is currently named `libbitsandbytes_cudaxxy` for cuda version `xx.y`.
+  # This upstream convention could change at some point and thus break the following patch.
+  postPatch = lib.optionalString cudaSupport ''
+    substituteInPlace bitsandbytes/cextension.py \
+      --replace-fail "if cuda_specs:" "if True:" \
+      --replace-fail \
+        "cuda_binary_path = get_cuda_bnb_library_path(cuda_specs)" \
+        "cuda_binary_path = PACKAGE_DIR / 'libbitsandbytes_cuda${cudaVersionString}.so'"
+  '';
 
   nativeBuildInputs = [
+    cmake
+    cudaPackages.cuda_nvcc
+  ];
+
+  build-system = [
     setuptools
-    wheel
-  ] ++ lib.optionals torch.cudaSupport [ cuda-native-redist ];
+  ];
 
-  buildInputs = lib.optionals torch.cudaSupport [ cuda-redist ];
+  buildInputs = lib.optionals cudaSupport [ cuda-redist ];
 
-  propagatedBuildInputs = [
+  cmakeFlags = [
+    (lib.cmakeFeature "COMPUTE_BACKEND" (if cudaSupport then "cuda" else "cpu"))
+  ];
+  CUDA_HOME = "${cuda-native-redist}";
+  NVCC_PREPEND_FLAGS = lib.optionals cudaSupport [
+    "-I${cuda-native-redist}/include"
+    "-L${cuda-native-redist}/lib"
+  ];
+
+  preBuild = ''
+    make -j $NIX_BUILD_CORES
+    cd .. # leave /build/source/build
+  '';
+
+  dependencies = [
     scipy
     torch
   ];
@@ -97,11 +110,11 @@ buildPythonPackage {
 
   pythonImportsCheck = [ "bitsandbytes" ];
 
-  meta = with lib; {
+  meta = {
     description = "8-bit CUDA functions for PyTorch";
     homepage = "https://github.com/TimDettmers/bitsandbytes";
     changelog = "https://github.com/TimDettmers/bitsandbytes/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ bcdarwin ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ bcdarwin ];
   };
 }

From adaaba7b85d075db62cb790d0a5d2fe4b86bc366 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 29 Oct 2024 11:34:51 +0100
Subject: [PATCH 41/59] openmolcas: properly build shared libs.

Remove unneeded static libs when build as static build.
---
 pkgs/applications/science/chemistry/openmolcas/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix
index 76192e4d4de9..d67ecf21d7f1 100644
--- a/pkgs/applications/science/chemistry/openmolcas/default.nix
+++ b/pkgs/applications/science/chemistry/openmolcas/default.nix
@@ -109,6 +109,8 @@ stdenv.mkDerivation rec {
     (lib.strings.cmakeBool "DMRG" enableQcmaquis)
     (lib.strings.cmakeBool "NEVPT2" enableQcmaquis)
     "-DCMAKE_SKIP_BUILD_RPATH=ON"
+    (lib.strings.cmakeBool "BUILD_STATIC_LIBS" stdenv.hostPlatform.isStatic)
+    (lib.strings.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
   ] ++ lib.optionals (blas-ilp64.passthru.implementation == "openblas") [
     "-DOPENBLASROOT=${blas-ilp64.passthru.provider.dev}"
     "-DLINALG=OpenBLAS"

From 00e7e7f70b49daec95b5259dacb0a499cff49fdb Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 29 Oct 2024 22:50:14 +0100
Subject: [PATCH 42/59] openmolcas: remove superflous cmakeFlag for openblas

---
 pkgs/applications/science/chemistry/openmolcas/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix
index d67ecf21d7f1..2b17fb368364 100644
--- a/pkgs/applications/science/chemistry/openmolcas/default.nix
+++ b/pkgs/applications/science/chemistry/openmolcas/default.nix
@@ -101,7 +101,6 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DOPENMP=ON"
-    "-DLINALG=OpenBLAS"
     "-DTOOLS=ON"
     "-DHDF5=ON"
     "-DFDE=ON"

From 356e7ac19ca817e958bc12595776c234a3c38904 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 30 Oct 2024 10:34:53 +0100
Subject: [PATCH 43/59] openmolcas: remove nested with in meta

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

diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix
index 2b17fb368364..d835bccf18bf 100644
--- a/pkgs/applications/science/chemistry/openmolcas/default.nix
+++ b/pkgs/applications/science/chemistry/openmolcas/default.nix
@@ -149,11 +149,11 @@ stdenv.mkDerivation rec {
     wrapProgram $out/bin/pymolcas --set MOLCAS $out
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Advanced quantum chemistry software package";
     homepage = "https://gitlab.com/Molcas/OpenMolcas";
-    maintainers = [ maintainers.markuskowa ];
-    license = with licenses; [ lgpl21Only bsd3 ];
+    maintainers = [ lib.maintainers.markuskowa ];
+    license = with lib.licenses; [ lgpl21Only bsd3 ];
     platforms = [ "aarch64-linux" "x86_64-linux" ];
     mainProgram = "pymolcas";
   };

From 5ad947701f1d3723305c0ccec19ae88df96593d2 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Wed, 30 Oct 2024 10:36:17 +0100
Subject: [PATCH 44/59] openmolcas: apply nixfmt

---
 .../science/chemistry/openmolcas/default.nix  | 140 ++++++++++--------
 1 file changed, 81 insertions(+), 59 deletions(-)

diff --git a/pkgs/applications/science/chemistry/openmolcas/default.nix b/pkgs/applications/science/chemistry/openmolcas/default.nix
index d835bccf18bf..f3687a64d599 100644
--- a/pkgs/applications/science/chemistry/openmolcas/default.nix
+++ b/pkgs/applications/science/chemistry/openmolcas/default.nix
@@ -1,34 +1,45 @@
-{ lib
-, stdenv
-, fetchFromGitLab
-, fetchFromGitHub
-, cmake
-, gfortran
-, perl
-, blas-ilp64
-, hdf5-cpp
-, python3
-, texliveMinimal
-, armadillo
-, libxc
-, makeWrapper
-, gsl
-, boost180
-, autoPatchelfHook
-, enableQcmaquis ? false
+{
+  lib,
+  stdenv,
+  fetchFromGitLab,
+  fetchFromGitHub,
+  cmake,
+  gfortran,
+  perl,
+  blas-ilp64,
+  hdf5-cpp,
+  python3,
+  texliveMinimal,
+  armadillo,
+  libxc,
+  makeWrapper,
+  gsl,
+  boost180,
+  autoPatchelfHook,
+  enableQcmaquis ? false,
   # Note that the CASPT2 module is broken with MPI
   # See https://gitlab.com/Molcas/OpenMolcas/-/issues/169
-, enableMpi ? false
-, mpi
-, globalarrays
+  enableMpi ? false,
+  mpi,
+  globalarrays,
 }:
 
 assert blas-ilp64.isILP64;
-assert lib.elem blas-ilp64.passthru.implementation [ "openblas" "mkl" ];
+assert lib.elem blas-ilp64.passthru.implementation [
+  "openblas"
+  "mkl"
+];
 assert enableQcmaquis -> lib.elem blas-ilp64.passthru.implementation "mkl";
 
 let
-  python = python3.withPackages (ps: with ps; [ six pyparsing numpy h5py ]);
+  python = python3.withPackages (
+    ps: with ps; [
+      six
+      pyparsing
+      numpy
+      h5py
+    ]
+  );
   qcmaquisSrc = fetchFromGitHub {
     owner = "qcscine";
     repo = "qcmaquis";
@@ -84,42 +95,48 @@ stdenv.mkDerivation rec {
     autoPatchelfHook
   ];
 
-  buildInputs = [
-    blas-ilp64.passthru.provider
-    hdf5-cpp
-    python
-    armadillo
-    libxc
-    gsl.dev
-    boost180
-  ] ++ lib.optionals enableMpi [
-    mpi
-    globalarrays
-  ];
+  buildInputs =
+    [
+      blas-ilp64.passthru.provider
+      hdf5-cpp
+      python
+      armadillo
+      libxc
+      gsl.dev
+      boost180
+    ]
+    ++ lib.optionals enableMpi [
+      mpi
+      globalarrays
+    ];
 
   passthru = lib.optionalAttrs enableMpi { inherit mpi; };
 
-  cmakeFlags = [
-    "-DOPENMP=ON"
-    "-DTOOLS=ON"
-    "-DHDF5=ON"
-    "-DFDE=ON"
-    "-DEXTERNAL_LIBXC=${lib.getDev libxc}"
-    (lib.strings.cmakeBool "DMRG" enableQcmaquis)
-    (lib.strings.cmakeBool "NEVPT2" enableQcmaquis)
-    "-DCMAKE_SKIP_BUILD_RPATH=ON"
-    (lib.strings.cmakeBool "BUILD_STATIC_LIBS" stdenv.hostPlatform.isStatic)
-    (lib.strings.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
-  ] ++ lib.optionals (blas-ilp64.passthru.implementation == "openblas") [
-    "-DOPENBLASROOT=${blas-ilp64.passthru.provider.dev}"
-    "-DLINALG=OpenBLAS"
-  ] ++ lib.optionals (blas-ilp64.passthru.implementation == "mkl") [
-    "-DMKLROOT=${blas-ilp64.passthru.provider}"
-    "-DLINALG=MKL"
-  ] ++ lib.optionals enableMpi [
-    "-DGA=ON"
-    "-DMPI=ON"
-  ];
+  cmakeFlags =
+    [
+      "-DOPENMP=ON"
+      "-DTOOLS=ON"
+      "-DHDF5=ON"
+      "-DFDE=ON"
+      "-DEXTERNAL_LIBXC=${lib.getDev libxc}"
+      (lib.strings.cmakeBool "DMRG" enableQcmaquis)
+      (lib.strings.cmakeBool "NEVPT2" enableQcmaquis)
+      "-DCMAKE_SKIP_BUILD_RPATH=ON"
+      (lib.strings.cmakeBool "BUILD_STATIC_LIBS" stdenv.hostPlatform.isStatic)
+      (lib.strings.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
+    ]
+    ++ lib.optionals (blas-ilp64.passthru.implementation == "openblas") [
+      "-DOPENBLASROOT=${blas-ilp64.passthru.provider.dev}"
+      "-DLINALG=OpenBLAS"
+    ]
+    ++ lib.optionals (blas-ilp64.passthru.implementation == "mkl") [
+      "-DMKLROOT=${blas-ilp64.passthru.provider}"
+      "-DLINALG=MKL"
+    ]
+    ++ lib.optionals enableMpi [
+      "-DGA=ON"
+      "-DMPI=ON"
+    ];
 
   preConfigure = lib.optionalString enableMpi ''
     export GAROOT=${globalarrays};
@@ -153,9 +170,14 @@ stdenv.mkDerivation rec {
     description = "Advanced quantum chemistry software package";
     homepage = "https://gitlab.com/Molcas/OpenMolcas";
     maintainers = [ lib.maintainers.markuskowa ];
-    license = with lib.licenses; [ lgpl21Only bsd3 ];
-    platforms = [ "aarch64-linux" "x86_64-linux" ];
+    license = with lib.licenses; [
+      lgpl21Only
+      bsd3
+    ];
+    platforms = [
+      "aarch64-linux"
+      "x86_64-linux"
+    ];
     mainProgram = "pymolcas";
   };
 }
-

From 22d96066ffe6f306518e28383763453879bd555c Mon Sep 17 00:00:00 2001
From: Tobias Mayer <tobim@fastmail.fm>
Date: Wed, 30 Oct 2024 10:41:59 +0100
Subject: [PATCH 45/59] python3Packages.dask-expr: fix source hash

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

diff --git a/pkgs/development/python-modules/dask-expr/default.nix b/pkgs/development/python-modules/dask-expr/default.nix
index 4598356713e6..5f66528967e0 100644
--- a/pkgs/development/python-modules/dask-expr/default.nix
+++ b/pkgs/development/python-modules/dask-expr/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "dask";
     repo = "dask-expr";
     rev = "refs/tags/v${version}";
-    hash = "sha256-7c0P+UTdjyOPdj0AM38TysNdbegT6N1iKKg6Kdgu8jI=";
+    hash = "sha256-HHoUQ6LfrlUnZNvvbPbQbNW6WLabGa88RsC9M8hlARI=";
   };
 
   postPatch = ''

From d8f8dfd9404c8b632841cdb0bae1540d7f7312db Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 30 Oct 2024 11:09:27 +0100
Subject: [PATCH 46/59] python312Packages.leaone-ble: init at 0.1.0

Bluetooth parser for LeaOne devices

https://github.com/bluetooth-devices/leaone-ble
---
 .../python-modules/leaone-ble/default.nix     | 52 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 54 insertions(+)
 create mode 100644 pkgs/development/python-modules/leaone-ble/default.nix

diff --git a/pkgs/development/python-modules/leaone-ble/default.nix b/pkgs/development/python-modules/leaone-ble/default.nix
new file mode 100644
index 000000000000..5df616e5f8d6
--- /dev/null
+++ b/pkgs/development/python-modules/leaone-ble/default.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  bluetooth-data-tools,
+  bluetooth-sensor-state-data,
+  buildPythonPackage,
+  fetchFromGitHub,
+  home-assistant-bluetooth,
+  poetry-core,
+  pytest-cov-stub,
+  pytestCheckHook,
+  pythonOlder,
+  sensor-state-data,
+}:
+
+buildPythonPackage rec {
+  pname = "leaone-ble";
+  version = "0.1.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.11";
+
+  src = fetchFromGitHub {
+    owner = "bluetooth-devices";
+    repo = "leaone-ble";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-usFjI0zU89dEAbmx9mVemoxlYS8mmLTKIMhH26Rvkeg=";
+  };
+
+  build-system = [ poetry-core ];
+
+  dependencies = [
+    bluetooth-data-tools
+    bluetooth-sensor-state-data
+    home-assistant-bluetooth
+    sensor-state-data
+  ];
+
+  nativeCheckInputs = [
+    pytest-cov-stub
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "leaone_ble" ];
+
+  meta = {
+    description = "Bluetooth parser for LeaOne devices";
+    homepage = "https://github.com/bluetooth-devices/leaone-ble";
+    changelog = "https://github.com/bluetooth-devices/leaone-ble/blob/${src.rev}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f201fad95c5f..545dac4239b5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7010,6 +7010,8 @@ self: super: with self; {
 
   leanblueprint = callPackage ../development/python-modules/leanblueprint { };
 
+  leaone-ble = callPackage ../development/python-modules/leaone-ble { };
+
   leb128 = callPackage ../development/python-modules/leb128 { };
 
   led-ble = callPackage ../development/python-modules/led-ble { };

From a847e503003957a1b82fa3283ab30b0f940b29e3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 30 Oct 2024 11:10:39 +0100
Subject: [PATCH 47/59] home-assistant: update component-packages

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index c6a244127429..828f94258ab4 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2332,13 +2332,14 @@
       hassil
       home-assistant-intents
       ifaddr
+      leaone-ble
       mutagen
       pymicro-vad
       pyserial
       pyspeex-noise
       pyudev
       zeroconf
-    ]; # missing inputs: leaone-ble
+    ];
     "led_ble" = ps: with ps; [
       aioesphomeapi
       aioruuvigateway
@@ -5396,6 +5397,7 @@
     "lawn_mower"
     "lcn"
     "ld2410_ble"
+    "leaone"
     "led_ble"
     "lektrico"
     "lg_netcast"

From 55dc89b4e7ffd7e84a187330256b74faafe7e7b1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 30 Oct 2024 11:21:40 +0100
Subject: [PATCH 48/59] python312Packages.py-improv-ble-client: init at 1.0.4

Module to provision devices which implement Improv via BLE

https://github.com/home-assistant-libs/py-improv-ble-client
---
 .../py-improv-ble-client/default.nix          | 50 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/development/python-modules/py-improv-ble-client/default.nix

diff --git a/pkgs/development/python-modules/py-improv-ble-client/default.nix b/pkgs/development/python-modules/py-improv-ble-client/default.nix
new file mode 100644
index 000000000000..7f983cf534c5
--- /dev/null
+++ b/pkgs/development/python-modules/py-improv-ble-client/default.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  bleak-retry-connector,
+  bleak,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pythonOlder,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "py-improv-ble-client";
+  version = "1.0.4";
+  pyproject = true;
+
+  disabled = pythonOlder "3.11";
+
+  src = fetchFromGitHub {
+    owner = "home-assistant-libs";
+    repo = "py-improv-ble-client";
+    rev = "refs/tags/${version}";
+    hash = "sha256-leYSDB5/jFqlvX78OYzlFkkVxIkJ7iOUoLHBuVj7tAo=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools~=65.6" "setuptools" \
+      --replace-fail "wheel~=0.37.1" "wheel"
+  '';
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    bleak
+    bleak-retry-connector
+  ];
+
+  # Module has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [ "improv_ble_client" ];
+
+  meta = {
+    description = "Module to provision devices which implement Improv via BLE";
+    homepage = "https://github.com/home-assistant-libs/py-improv-ble-client";
+    changelog = "https://github.com/home-assistant-libs/py-improv-ble-client/releases/tag/${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f201fad95c5f..b5bf6249540e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9197,6 +9197,8 @@ self: super: with self; {
 
   py-expression-eval = callPackage ../development/python-modules/py-expression-eval { };
 
+  py-improv-ble-client = callPackage ../development/python-modules/py-improv-ble-client { };
+
   py-machineid = callPackage ../development/python-modules/py-machineid { };
 
   py-ocsf-models = callPackage ../development/python-modules/py-ocsf-models { };

From 0af4945f904dbcb065857b1ae8b4ab2bd6866b28 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 30 Oct 2024 11:23:09 +0100
Subject: [PATCH 49/59] home-assistant: update component-packages

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index c6a244127429..3f5cca96fbf0 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -1940,12 +1940,13 @@
       home-assistant-intents
       ifaddr
       mutagen
+      py-improv-ble-client
       pymicro-vad
       pyserial
       pyspeex-noise
       pyudev
       zeroconf
-    ]; # missing inputs: py-improv-ble-client
+    ];
     "incomfort" = ps: with ps; [
       incomfort-client
     ];
@@ -5342,6 +5343,7 @@
     "image_upload"
     "imap"
     "imgw_pib"
+    "improv_ble"
     "incomfort"
     "influxdb"
     "inkbird"

From b666e43fe9c69488f884696f8e06fa9c5437d1c1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 30 Oct 2024 09:13:27 +0100
Subject: [PATCH 50/59] python312Packages.ydata-profiling: 4.11.0 -> 4.12.0

Diff: https://github.com/ydataai/ydata-profiling/compare/refs/tags/v4.11.0...4.12.0

Changelog: https://github.com/ydataai/ydata-profiling/releases/tag/4.12.0
---
 .../ydata-profiling/default.nix               | 73 ++++++++++---------
 1 file changed, 39 insertions(+), 34 deletions(-)

diff --git a/pkgs/development/python-modules/ydata-profiling/default.nix b/pkgs/development/python-modules/ydata-profiling/default.nix
index 74be2546c623..334261463c62 100644
--- a/pkgs/development/python-modules/ydata-profiling/default.nix
+++ b/pkgs/development/python-modules/ydata-profiling/default.nix
@@ -1,54 +1,59 @@
-{ lib
-, buildPythonPackage
-, fetchFromGitHub
-, pythonOlder
-, pytestCheckHook
-, dacite
-, htmlmin
-, imagehash
-, jinja2
-, matplotlib
-, multimethod
-, numba
-, numpy
-, pandas
-, phik
-, pyarrow
-, pydantic
-, pyyaml
-, requests
-, scipy
-, seaborn
-, statsmodels
-, tqdm
-, typeguard
-, visions
-, wordcloud
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pythonOlder,
+  pytestCheckHook,
+  dacite,
+  htmlmin,
+  imagehash,
+  jinja2,
+  matplotlib,
+  multimethod,
+  numba,
+  numpy,
+  pandas,
+  phik,
+  pyarrow,
+  pydantic,
+  pyyaml,
+  requests,
+  scipy,
+  setuptools,
+  seaborn,
+  statsmodels,
+  tqdm,
+  typeguard,
+  visions,
+  wordcloud,
 }:
 
 buildPythonPackage rec {
   pname = "ydata-profiling";
-  version = "4.11.0";
+  version = "4.12.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "ydataai";
-    repo = pname;
+    repo = "ydata-profiling";
     rev = "refs/tags/v${version}";
-    hash = "sha256-3bgFPPGgLCcJfYr9vmwnHFwz3/zybRI8Aiu5VoOPsNA=";
+    hash = "sha256-G1qW6HcJi176nfxOBGBK2tLyY/Nnz9STYpZWluWvhP0=";
   };
 
   preBuild = ''
     echo ${version} > VERSION
   '';
 
+  build-system = [ setuptools ];
+
   pythonRelaxDeps = [
+    "imagehash"
     "scipy"
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     dacite
     htmlmin
     imagehash
@@ -72,9 +77,10 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
-    pytestCheckHook
     pyarrow
+    pytestCheckHook
   ];
+
   disabledTestPaths = [
     # needs Spark:
     "tests/backends/spark_backend"
@@ -84,6 +90,7 @@ buildPythonPackage rec {
     "tests/unit/test_dataset_schema.py"
     "tests/unit/test_modular.py"
   ];
+
   disabledTests = [
     # try to download data:
     "test_decorator"
@@ -92,9 +99,7 @@ buildPythonPackage rec {
     "test_urls"
   ];
 
-  pythonImportsCheck = [
-    "ydata_profiling"
-  ];
+  pythonImportsCheck = [ "ydata_profiling" ];
 
   meta = with lib; {
     description = "Create HTML profiling reports from Pandas DataFrames";

From 3700d6fb314e06b7480c5c728e01bc0f063677d6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 30 Oct 2024 11:27:15 +0100
Subject: [PATCH 51/59] python312Packages.imagehash: 4.3.1 -> 4.3.2

Diff: JohannesBuchner/imagehash@refs/tags/v4.3.1...v4.3.2

Changelog: https://github.com/JohannesBuchner/imagehash/releases/tag/v4.3.2
---
 .../python-modules/imagehash/default.nix      | 33 ++++++++++++-------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/imagehash/default.nix b/pkgs/development/python-modules/imagehash/default.nix
index 782aab2360d4..c53243e48f00 100644
--- a/pkgs/development/python-modules/imagehash/default.nix
+++ b/pkgs/development/python-modules/imagehash/default.nix
@@ -2,41 +2,52 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pytestCheckHook,
   numpy,
-  six,
-  scipy,
   pillow,
+  pytestCheckHook,
+  pythonOlder,
   pywavelets,
+  scipy,
+  setuptools,
+  six,
 }:
 
 buildPythonPackage rec {
   pname = "imagehash";
-  version = "4.3.1";
-  format = "setuptools";
+  version = "4.3.2";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "JohannesBuchner";
     repo = "imagehash";
-    rev = "v${version}";
-    hash = "sha256-Tsq10TZqnzNTuO4goKjdylN4Eqy7DNbHLjr5n3+nidM=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-/kYINT26ROlB3fIcyyR79nHKg9FsJRQsXQx0Bvl14ec=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     numpy
-    six
     scipy
     pillow
     pywavelets
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    six
+  ];
+
+  pythonImportsCheck = [ "imagehash" ];
 
   meta = with lib; {
     description = "Python Perceptual Image Hashing Module";
-    mainProgram = "find_similar_images.py";
     homepage = "https://github.com/JohannesBuchner/imagehash";
+    changelog = "https://github.com/JohannesBuchner/imagehash/releases/tag/v${version}";
     license = licenses.bsd2;
     maintainers = with maintainers; [ e1mo ];
+    mainProgram = "find_similar_images.py";
   };
 }

From 4fe32ba1eb2c15b2867352f314a05edac0348e4b Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 30 Oct 2024 11:56:51 +0100
Subject: [PATCH 52/59] ivyterm: fix hash

---
 pkgs/by-name/iv/ivyterm/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/iv/ivyterm/package.nix b/pkgs/by-name/iv/ivyterm/package.nix
index 7fe42f201b93..b5c7c26f09ce 100644
--- a/pkgs/by-name/iv/ivyterm/package.nix
+++ b/pkgs/by-name/iv/ivyterm/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage {
     owner = "Tomiyou";
     repo = "ivyterm";
     rev = "13ee76dfc88bc92807e328991c7a8586a5b13ac7";
-    hash = "sha256-vxDJwA+ZM3ROX9d1+o3cXj4LbaO9Wy5jFAVuAPOzCCI=";
+    hash = "sha256-RVHGDgaNYhR/eGTu4bhJvEfd14qFP+u8ApItVc00Bm8=";
   };
 
   cargoHash = "sha256-tdaI0diwRjqERmAiuKFhMw4AeqxgMq8YMsZWBjsmd0U=";

From 1eb6cc15823a0b0568296a812de0e0160cd7fadc Mon Sep 17 00:00:00 2001
From: ppom <ppom@ppom.me>
Date: Tue, 29 Oct 2024 12:00:00 +0100
Subject: [PATCH 53/59] nixos/peertube: startup script: exec into nodejs

1. Removed the #!/bin/sh shebang at the beginning, because
systemd.services.<name>.script already adds a #!/nix/store/.../bin/bash
shebang.

Previously:
	#!/nix/store/516kai7nl5dxr792c0nzq0jp8m4zvxpi-bash-5.2p32/bin/bash
	set -e
	#!/bin/sh
	umask 077
	...

2. Exec into nodejs, so that the startup script is no longer running but
replaces itself by nodejs.
This way, only one processus is running inside peertube.service.
---
 nixos/modules/services/web-apps/peertube.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-apps/peertube.nix b/nixos/modules/services/web-apps/peertube.nix
index e3f15f4f438c..4f5ea3390e88 100644
--- a/nixos/modules/services/web-apps/peertube.nix
+++ b/nixos/modules/services/web-apps/peertube.nix
@@ -432,7 +432,6 @@ in {
       path = with pkgs; [ nodejs_18 yarn ffmpeg-headless openssl ];
 
       script = ''
-        #!/bin/sh
         umask 077
         cat > /var/lib/peertube/config/local.yaml <<EOF
         ${lib.optionalString (cfg.secrets.secretsFile != null) ''
@@ -457,7 +456,7 @@ in {
         ln -sf ${cfg.package}/config/default.yaml /var/lib/peertube/config/default.yaml
         ln -sf ${cfg.package}/client/dist -T /var/lib/peertube/www/client
         ln -sf ${cfg.settings.storage.client_overrides} -T /var/lib/peertube/www/client-overrides
-        node dist/server
+        exec node dist/server
       '';
       serviceConfig = {
         Type = "simple";

From cafb7b80a9d7851d2555e6cb41ae124540cd1ffa Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 30 Oct 2024 15:18:58 +0100
Subject: [PATCH 54/59] python312Packages.melnor-bluetooth: init at 0.0.25

Module to interact with Melnor and Eden bluetooth watering timers

https://github.com/vanstinator/melnor-bluetooth
---
 .../melnor-bluetooth/default.nix              | 64 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 66 insertions(+)
 create mode 100644 pkgs/development/python-modules/melnor-bluetooth/default.nix

diff --git a/pkgs/development/python-modules/melnor-bluetooth/default.nix b/pkgs/development/python-modules/melnor-bluetooth/default.nix
new file mode 100644
index 000000000000..649433f99795
--- /dev/null
+++ b/pkgs/development/python-modules/melnor-bluetooth/default.nix
@@ -0,0 +1,64 @@
+{
+  lib,
+  aioconsole,
+  bleak-retry-connector,
+  bleak,
+  buildPythonPackage,
+  deprecated,
+  fetchFromGitHub,
+  freezegun,
+  poetry-core,
+  poetry-dynamic-versioning,
+  pytest-asyncio,
+  pytestCheckHook,
+  pythonOlder,
+  syrupy,
+  tzdata,
+  tzlocal,
+}:
+
+buildPythonPackage rec {
+  pname = "melnor-bluetooth";
+  version = "0.0.25";
+  pyproject = true;
+
+  disabled = pythonOlder "3.9";
+
+  src = fetchFromGitHub {
+    owner = "vanstinator";
+    repo = "melnor-bluetooth";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-BQKXQrPT/+qm9cRO7pfScPwW0iwdhliTfX4XJ/kRQG0=";
+  };
+
+  build-system = [
+    poetry-core
+    poetry-dynamic-versioning
+  ];
+
+  dependencies = [
+    aioconsole
+    bleak
+    bleak-retry-connector
+    deprecated
+    tzdata
+    tzlocal
+  ];
+
+  nativeCheckInputs = [
+    freezegun
+    pytest-asyncio
+    pytestCheckHook
+    syrupy
+  ];
+
+  pythonImportsCheck = [ "melnor_bluetooth" ];
+
+  meta = {
+    description = "Module to interact with Melnor and Eden bluetooth watering timers";
+    homepage = "https://github.com/vanstinator/melnor-bluetooth";
+    changelog = "https://github.com/vanstinator/melnor-bluetooth/releases/tag/v${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f76e09765315..ea44aba2beae 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7845,6 +7845,8 @@ self: super: with self; {
 
   meld3 = callPackage ../development/python-modules/meld3 { };
 
+  melnor-bluetooth = callPackage ../development/python-modules/melnor-bluetooth { };
+
   memestra = callPackage ../development/python-modules/memestra { };
 
   memory-allocator = callPackage ../development/python-modules/memory-allocator { };

From 78c09e1a687a8bb3772182363712fdbdccb29e9f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 30 Oct 2024 15:20:48 +0100
Subject: [PATCH 55/59] home-assistant: update component-packages

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index c6a244127429..da29be0cfe04 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2597,13 +2597,14 @@
       hassil
       home-assistant-intents
       ifaddr
+      melnor-bluetooth
       mutagen
       pymicro-vad
       pyserial
       pyspeex-noise
       pyudev
       zeroconf
-    ]; # missing inputs: melnor-bluetooth
+    ];
     "meraki" = ps: with ps; [
     ];
     "mercury_nz" = ps: with ps; [
@@ -5443,6 +5444,7 @@
     "media_player"
     "media_source"
     "melcloud"
+    "melnor"
     "meraki"
     "met"
     "met_eireann"

From 4c4a2d38a14590691949f6b941dd9f478c8def6d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 30 Oct 2024 09:47:53 +0100
Subject: [PATCH 56/59] python312Packages.pydeako: init at 0.5.4

Module used to discover and communicate with Deako devices over the network locally

https://github.com/DeakoLights/pydeako
---
 .../python-modules/pydeako/default.nix        | 49 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/development/python-modules/pydeako/default.nix

diff --git a/pkgs/development/python-modules/pydeako/default.nix b/pkgs/development/python-modules/pydeako/default.nix
new file mode 100644
index 000000000000..6fabf92f5f84
--- /dev/null
+++ b/pkgs/development/python-modules/pydeako/default.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  mock,
+  pytest-asyncio,
+  pytestCheckHook,
+  pythonOlder,
+  setuptools,
+  zeroconf,
+}:
+
+buildPythonPackage rec {
+  pname = "pydeako";
+  version = "0.5.4";
+  pyproject = true;
+
+  disabled = pythonOlder "3.11";
+
+  src = fetchFromGitHub {
+    owner = "DeakoLights";
+    repo = "pydeako";
+    rev = "refs/tags/${version}";
+    hash = "sha256-Z0H5VhWfjmvvCGTX//hds9dwk2wJSPXckNac1PkQZNA=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [ zeroconf ];
+
+  # Module has no tests
+  #doCheck = false;
+
+  nativeCheckInputs = [
+    mock
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "pydeako" ];
+
+  meta = {
+    description = "Module used to discover and communicate with Deako devices over the network locally";
+    homepage = "https://github.com/DeakoLights/pydeako";
+    changelog = "https://github.com/DeakoLights/pydeako/releases/tag/${version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f201fad95c5f..9be4215a6d15 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11212,6 +11212,8 @@ self: super: with self; {
 
   pydbus = callPackage ../development/python-modules/pydbus { };
 
+  pydeako = callPackage ../development/python-modules/pydeako { };
+
   pydeck = callPackage ../development/python-modules/pydeck { };
 
   pydeconz = callPackage ../development/python-modules/pydeconz { };

From 62cfd07ea70886ab478ddfed03d6078c42586461 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 30 Oct 2024 09:55:30 +0100
Subject: [PATCH 57/59] home-assistant: update component-packages

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index c6a244127429..8c22d0b58be3 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -754,8 +754,9 @@
     ];
     "deako" = ps: with ps; [
       ifaddr
+      pydeako
       zeroconf
-    ]; # missing inputs: pydeako
+    ];
     "debugpy" = ps: with ps; [
       debugpy
     ];
@@ -5126,6 +5127,7 @@
     "datadog"
     "date"
     "datetime"
+    "deako"
     "debugpy"
     "deconz"
     "default_config"

From 55df3a285d8127c496c14c01978169a8c13d4ca3 Mon Sep 17 00:00:00 2001
From: Pierre Roux <pierre.roux@onera.fr>
Date: Wed, 30 Oct 2024 11:21:31 +0100
Subject: [PATCH 58/59] ocamlPackages.elpi: add 1.18.2

---
 pkgs/development/ocaml-modules/elpi/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix
index 9afe4ac9182d..29ee03b9df04 100644
--- a/pkgs/development/ocaml-modules/elpi/default.nix
+++ b/pkgs/development/ocaml-modules/elpi/default.nix
@@ -18,6 +18,7 @@ let camlp5 = p5.override { legacy = true; }; in
 let fetched = coqPackages.metaFetch ({
     release."1.20.0".sha256 = "sha256-lctZAIQgOg5d+LfILtWsBVcsemV3zTZYfJfDlCxHtcA=";
     release."1.19.2".sha256 = "sha256-dBj5Ek7PWq/8Btq/dggJUqa8cUtfvbi6EWo/lJEDOU4=";
+    release."1.18.2".sha256 = "sha256-usOYukHQ/h4YBxlhYrAkMTVjNm97hq4IArI9bvDzy/k=";
     release."1.18.1".sha256 = "sha256-rrIv/mVC0Ez3nU7fpnzwduIC3tI6l73DjgAbv1gd2v0=";
     release."1.17.0".sha256 = "sha256-J8FJBeaB+2HtHjrkgNzOZJngZ2AcYU+npL9Y1HNPnzo=";
     release."1.15.2".sha256 = "sha256-+sQYQiN3n+dlzXzi5opOjhkJZqpkNwlHZcUjaUM6+xQ=";

From 05e3b3d344c2bb880135da1b1c29be318af330be Mon Sep 17 00:00:00 2001
From: Nick Hu <me@nickhu.co.uk>
Date: Wed, 30 Oct 2024 17:18:44 +0000
Subject: [PATCH 59/59] zotero: init darwin (#351227)

---
 pkgs/applications/office/zotero/darwin.nix  |  33 +++++
 pkgs/applications/office/zotero/default.nix | 130 ++++----------------
 pkgs/applications/office/zotero/linux.nix   | 118 ++++++++++++++++++
 3 files changed, 173 insertions(+), 108 deletions(-)
 create mode 100644 pkgs/applications/office/zotero/darwin.nix
 create mode 100644 pkgs/applications/office/zotero/linux.nix

diff --git a/pkgs/applications/office/zotero/darwin.nix b/pkgs/applications/office/zotero/darwin.nix
new file mode 100644
index 000000000000..ad60ee9d409e
--- /dev/null
+++ b/pkgs/applications/office/zotero/darwin.nix
@@ -0,0 +1,33 @@
+{
+  pname,
+  version,
+  meta,
+  stdenv,
+  fetchurl,
+  undmg,
+}:
+
+stdenv.mkDerivation rec {
+  inherit pname version meta;
+
+  src = fetchurl {
+    url = "https://download.zotero.org/client/release/${version}/Zotero-${version}.dmg";
+    hash = "sha256-z1HAkHz4JGRfQJna2cINZTmYPzyj9ofp7mJHN/mNyOo=";
+  };
+  sourceRoot = ".";
+
+  nativeBuildInputs = [ undmg ];
+
+  dontConfigure = true;
+  dontBuild = true;
+  dontFixup = true; # breaks notarization
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/Applications
+    cp -r Zotero.app $out/Applications
+
+    runHook postInstall
+  '';
+}
diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix
index 01d6fe74c502..f6117050c97f 100644
--- a/pkgs/applications/office/zotero/default.nix
+++ b/pkgs/applications/office/zotero/default.nix
@@ -1,116 +1,30 @@
-{ lib
-, stdenv
-, fetchurl
-, wrapGAppsHook3
-, makeDesktopItem
-, alsa-lib
-, atk
-, cairo
-, dbus-glib
-, gdk-pixbuf
-, glib
-, gtk3
-, libGL
-, libva
-, xorg
-, mesa
-, pango
-, pciutils
+{
+  lib,
+  stdenv,
+  callPackage,
 }:
 
-stdenv.mkDerivation rec {
+let
   pname = "zotero";
   version = "7.0.8";
-
-  src = fetchurl {
-    url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
-    hash = "sha256-utiqS4/PvlkQesqTOyEvj8uwW1sDxlqjnhv6GFfY5uk=";
-  };
-
-  dontPatchELF = true;
-  nativeBuildInputs = [ wrapGAppsHook3 ];
-
-  libPath = lib.makeLibraryPath [
-    alsa-lib
-    atk
-    cairo
-    dbus-glib
-    gdk-pixbuf
-    glib
-    gtk3
-    libGL
-    libva
-    xorg.libX11
-    xorg.libXcomposite
-    xorg.libXcursor
-    xorg.libXdamage
-    xorg.libXext
-    xorg.libXfixes
-    xorg.libXi
-    xorg.libXrandr
-    xorg.libXtst
-    xorg.libxcb
-    mesa
-    pango
-    pciutils
-  ] + ":" + lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ];
-
-  desktopItem = makeDesktopItem {
-    name = "zotero";
-    exec = "zotero -url %U";
-    icon = "zotero";
-    comment = meta.description;
-    desktopName = "Zotero";
-    genericName = "Reference Management";
-    categories = [ "Office" "Database" ];
-    startupNotify = true;
-    mimeTypes = [ "x-scheme-handler/zotero" "text/plain" ];
-  };
-
-  installPhase = ''
-    runHook preInstall
-
-    # Copy package contents to the output directory
-    mkdir -p "$prefix/usr/lib/zotero-bin-${version}"
-    cp -r * "$prefix/usr/lib/zotero-bin-${version}"
-    mkdir -p "$out/bin"
-    ln -s "$prefix/usr/lib/zotero-bin-${version}/zotero" "$out/bin/"
-
-    # Install desktop file and icons
-    mkdir -p $out/share/applications
-    cp ${desktopItem}/share/applications/* $out/share/applications/
-    for size in 32 64 128; do
-      install -Dm444 icons/icon''${size}.png \
-        $out/share/icons/hicolor/''${size}x''${size}/apps/zotero.png
-    done
-    install -Dm444 icons/symbolic.svg \
-      $out/share/icons/hicolor/symbolic/apps/zotero-symbolic.svg
-
-    runHook postInstall
-  '';
-
-  postFixup = ''
-    for executable in \
-      zotero-bin plugin-container updater vaapitest \
-      minidump-analyzer glxtest
-    do
-      if [ -e "$out/usr/lib/zotero-bin-${version}/$executable" ]; then
-        patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-          "$out/usr/lib/zotero-bin-${version}/$executable"
-      fi
-    done
-    find . -executable -type f -exec \
-      patchelf --set-rpath "$libPath" \
-        "$out/usr/lib/zotero-bin-${version}/{}" \;
-  '';
-
-  meta = with lib; {
+  meta = {
     homepage = "https://www.zotero.org";
     description = "Collect, organize, cite, and share your research sources";
     mainProgram = "zotero";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.agpl3Only;
-    platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ atila justanotherariel ];
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+    license = lib.licenses.agpl3Only;
+    platforms = [
+      "x86_64-linux"
+      "x86_64-darwin"
+      "aarch64-darwin"
+    ];
+    maintainers = with lib.maintainers; [
+      atila
+      justanotherariel
+    ];
   };
-}
+in
+if stdenv.hostPlatform.isDarwin then
+  callPackage ./darwin.nix { inherit pname version meta; }
+else
+  callPackage ./linux.nix { inherit pname version meta; }
diff --git a/pkgs/applications/office/zotero/linux.nix b/pkgs/applications/office/zotero/linux.nix
new file mode 100644
index 000000000000..1b7d58f86883
--- /dev/null
+++ b/pkgs/applications/office/zotero/linux.nix
@@ -0,0 +1,118 @@
+{
+  pname,
+  version,
+  meta,
+  lib,
+  stdenv,
+  fetchurl,
+  wrapGAppsHook3,
+  makeDesktopItem,
+  alsa-lib,
+  atk,
+  cairo,
+  dbus-glib,
+  gdk-pixbuf,
+  glib,
+  gtk3,
+  libGL,
+  libva,
+  xorg,
+  mesa,
+  pango,
+  pciutils,
+}:
+
+stdenv.mkDerivation rec {
+  inherit pname version meta;
+
+  src = fetchurl {
+    url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
+    hash = "sha256-utiqS4/PvlkQesqTOyEvj8uwW1sDxlqjnhv6GFfY5uk=";
+  };
+
+  dontPatchELF = true;
+  nativeBuildInputs = [ wrapGAppsHook3 ];
+
+  libPath =
+    lib.makeLibraryPath [
+      alsa-lib
+      atk
+      cairo
+      dbus-glib
+      gdk-pixbuf
+      glib
+      gtk3
+      libGL
+      libva
+      xorg.libX11
+      xorg.libXcomposite
+      xorg.libXcursor
+      xorg.libXdamage
+      xorg.libXext
+      xorg.libXfixes
+      xorg.libXi
+      xorg.libXrandr
+      xorg.libXtst
+      xorg.libxcb
+      mesa
+      pango
+      pciutils
+    ]
+    + ":"
+    + lib.makeSearchPathOutput "lib" "lib64" [ stdenv.cc.cc ];
+
+  desktopItem = makeDesktopItem {
+    name = "zotero";
+    exec = "zotero -url %U";
+    icon = "zotero";
+    comment = meta.description;
+    desktopName = "Zotero";
+    genericName = "Reference Management";
+    categories = [
+      "Office"
+      "Database"
+    ];
+    startupNotify = true;
+    mimeTypes = [
+      "x-scheme-handler/zotero"
+      "text/plain"
+    ];
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    # Copy package contents to the output directory
+    mkdir -p "$prefix/usr/lib/zotero-bin-${version}"
+    cp -r * "$prefix/usr/lib/zotero-bin-${version}"
+    mkdir -p "$out/bin"
+    ln -s "$prefix/usr/lib/zotero-bin-${version}/zotero" "$out/bin/"
+
+    # Install desktop file and icons
+    mkdir -p $out/share/applications
+    cp ${desktopItem}/share/applications/* $out/share/applications/
+    for size in 32 64 128; do
+      install -Dm444 icons/icon''${size}.png \
+        $out/share/icons/hicolor/''${size}x''${size}/apps/zotero.png
+    done
+    install -Dm444 icons/symbolic.svg \
+      $out/share/icons/hicolor/symbolic/apps/zotero-symbolic.svg
+
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    for executable in \
+      zotero-bin plugin-container updater vaapitest \
+      minidump-analyzer glxtest
+    do
+      if [ -e "$out/usr/lib/zotero-bin-${version}/$executable" ]; then
+        patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+          "$out/usr/lib/zotero-bin-${version}/$executable"
+      fi
+    done
+    find . -executable -type f -exec \
+      patchelf --set-rpath "$libPath" \
+        "$out/usr/lib/zotero-bin-${version}/{}" \;
+  '';
+}