From 065aa24d39a6287513287dbd340479d7bc5703ec Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Wed, 12 Jun 2024 00:02:28 -0400
Subject: [PATCH 01/93] libmatroska: migrate to by-name

---
 .../default.nix => by-name/li/libmatroska/package.nix}          | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/libraries/libmatroska/default.nix => by-name/li/libmatroska/package.nix} (100%)

diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/by-name/li/libmatroska/package.nix
similarity index 100%
rename from pkgs/development/libraries/libmatroska/default.nix
rename to pkgs/by-name/li/libmatroska/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6a87b68828c0..3f282f1a357a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22177,8 +22177,6 @@ with pkgs;
     jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
   };
 
-  libmatroska = callPackage ../development/libraries/libmatroska { };
-
   libmd = callPackage ../development/libraries/libmd { };
 
   libmemcached = callPackage ../development/libraries/libmemcached { };

From f9d30dcf8a084bc7cf6331b6f733aba1f83a4cff Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Wed, 12 Jun 2024 00:02:46 -0400
Subject: [PATCH 02/93] libmatroska: format with nixfmt

---
 pkgs/by-name/li/libmatroska/package.nix | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/li/libmatroska/package.nix b/pkgs/by-name/li/libmatroska/package.nix
index 7eb02d3ddd57..228a63dc52d5 100644
--- a/pkgs/by-name/li/libmatroska/package.nix
+++ b/pkgs/by-name/li/libmatroska/package.nix
@@ -1,17 +1,27 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libebml }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  libebml,
+}:
 
 stdenv.mkDerivation rec {
   pname = "libmatroska";
   version = "1.7.1";
 
   src = fetchFromGitHub {
-    owner  = "Matroska-Org";
-    repo   = "libmatroska";
-    rev    = "release-${version}";
+    owner = "Matroska-Org";
+    repo = "libmatroska";
+    rev = "release-${version}";
     sha256 = "sha256-hfu3Q1lIyMlWFWUM2Pu70Hie0rlQmua7Kq8kSIWnfHE=";
   };
 
-  nativeBuildInputs = [ cmake pkg-config ];
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
 
   buildInputs = [ libebml ];
 

From 08fa5d730303ecd17364198ef6feb18e3744215b Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Wed, 12 Jun 2024 00:03:07 -0400
Subject: [PATCH 03/93] libmatroska: add getchoo as maintainer

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

diff --git a/pkgs/by-name/li/libmatroska/package.nix b/pkgs/by-name/li/libmatroska/package.nix
index 228a63dc52d5..c0eff6538e40 100644
--- a/pkgs/by-name/li/libmatroska/package.nix
+++ b/pkgs/by-name/li/libmatroska/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     description = "Library to parse Matroska files";
     homepage = "https://matroska.org/";
     license = licenses.lgpl21;
-    maintainers = [ ];
+    maintainers = with maintainers; [ getchoo ];
     platforms = platforms.unix;
   };
 }

From 9f208ba029abfc35a91882f48ffb5db6fe87dcd5 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Wed, 12 Jun 2024 00:03:59 -0400
Subject: [PATCH 04/93] libmatroska: modernize

https://github.com/NixOS/nixpkgs/issues/208242
---
 pkgs/by-name/li/libmatroska/package.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/li/libmatroska/package.nix b/pkgs/by-name/li/libmatroska/package.nix
index c0eff6538e40..bb64b1bb635f 100644
--- a/pkgs/by-name/li/libmatroska/package.nix
+++ b/pkgs/by-name/li/libmatroska/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  pkg-config,
   libebml,
+  pkg-config,
 }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     owner = "Matroska-Org";
     repo = "libmatroska";
     rev = "release-${version}";
-    sha256 = "sha256-hfu3Q1lIyMlWFWUM2Pu70Hie0rlQmua7Kq8kSIWnfHE=";
+    hash = "sha256-hfu3Q1lIyMlWFWUM2Pu70Hie0rlQmua7Kq8kSIWnfHE=";
   };
 
   nativeBuildInputs = [
@@ -30,11 +30,12 @@ stdenv.mkDerivation rec {
     "-DCMAKE_INSTALL_PREFIX="
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Library to parse Matroska files";
     homepage = "https://matroska.org/";
-    license = licenses.lgpl21;
-    maintainers = with maintainers; [ getchoo ];
-    platforms = platforms.unix;
+    changelog = "https://github.com/Matroska-Org/libmatroska/blob/${src.rev}/NEWS.md";
+    license = lib.licenses.lgpl21;
+    maintainers = with lib.maintainers; [ getchoo ];
+    platforms = lib.platforms.unix;
   };
 }

From 5a476aa11c5ba360d49b4779314792bd83580f44 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Wed, 12 Jun 2024 00:05:10 -0400
Subject: [PATCH 05/93] libmatroska: remove unnecessary cmake flag

not exactly sure why this was here?
---
 pkgs/by-name/li/libmatroska/package.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/by-name/li/libmatroska/package.nix b/pkgs/by-name/li/libmatroska/package.nix
index bb64b1bb635f..deead5d9a0d4 100644
--- a/pkgs/by-name/li/libmatroska/package.nix
+++ b/pkgs/by-name/li/libmatroska/package.nix
@@ -25,10 +25,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libebml ];
 
-  cmakeFlags = [
-    "-DBUILD_SHARED_LIBS=YES"
-    "-DCMAKE_INSTALL_PREFIX="
-  ];
+  cmakeFlags = [ "-DBUILD_SHARED_LIBS=YES" ];
 
   meta = {
     description = "Library to parse Matroska files";

From eea880137fbc30df8b1eb91ddcfb3d326cc3d7bb Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Wed, 12 Jun 2024 00:10:24 -0400
Subject: [PATCH 06/93] libmatroska: split outputs

---
 pkgs/by-name/li/libmatroska/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/li/libmatroska/package.nix b/pkgs/by-name/li/libmatroska/package.nix
index deead5d9a0d4..f79ffe877cfe 100644
--- a/pkgs/by-name/li/libmatroska/package.nix
+++ b/pkgs/by-name/li/libmatroska/package.nix
@@ -11,6 +11,11 @@ stdenv.mkDerivation rec {
   pname = "libmatroska";
   version = "1.7.1";
 
+  outputs = [
+    "dev"
+    "out"
+  ];
+
   src = fetchFromGitHub {
     owner = "Matroska-Org";
     repo = "libmatroska";

From f28b426a21dc19e81402c9bce8966370206d65c7 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Wed, 12 Jun 2024 00:14:01 -0400
Subject: [PATCH 07/93] libmatroska: add validatePkgConfig hook

---
 pkgs/by-name/li/libmatroska/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/li/libmatroska/package.nix b/pkgs/by-name/li/libmatroska/package.nix
index f79ffe877cfe..74e4ca35dc28 100644
--- a/pkgs/by-name/li/libmatroska/package.nix
+++ b/pkgs/by-name/li/libmatroska/package.nix
@@ -5,6 +5,7 @@
   cmake,
   libebml,
   pkg-config,
+  validatePkgConfig,
 }:
 
 stdenv.mkDerivation rec {
@@ -26,6 +27,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
+    validatePkgConfig
   ];
 
   buildInputs = [ libebml ];

From 6d9d1fa6f2e345dd1e1a1cb97cee2cf4eb30fb23 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Wed, 12 Jun 2024 00:16:58 -0400
Subject: [PATCH 08/93] libmatroska: add pkg-config test

---
 pkgs/by-name/li/libmatroska/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/li/libmatroska/package.nix b/pkgs/by-name/li/libmatroska/package.nix
index 74e4ca35dc28..0dbd5ccc2eda 100644
--- a/pkgs/by-name/li/libmatroska/package.nix
+++ b/pkgs/by-name/li/libmatroska/package.nix
@@ -5,7 +5,9 @@
   cmake,
   libebml,
   pkg-config,
+  testers,
   validatePkgConfig,
+  libmatroska,
 }:
 
 stdenv.mkDerivation rec {
@@ -34,6 +36,10 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DBUILD_SHARED_LIBS=YES" ];
 
+  passthru = {
+    tests.pkg-config = testers.hasPkgConfigModules { package = libmatroska; };
+  };
+
   meta = {
     description = "Library to parse Matroska files";
     homepage = "https://matroska.org/";
@@ -41,5 +47,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.lgpl21;
     maintainers = with lib.maintainers; [ getchoo ];
     platforms = lib.platforms.unix;
+    pkgConfigModules = [ "libmatroska" ];
   };
 }

From c8fbf33c873af6fdcea138fa4f013346eda5d0f4 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Wed, 12 Jun 2024 00:21:07 -0400
Subject: [PATCH 09/93] libmatroska: add updateScript

---
 pkgs/by-name/li/libmatroska/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/li/libmatroska/package.nix b/pkgs/by-name/li/libmatroska/package.nix
index 0dbd5ccc2eda..8de6786dfa64 100644
--- a/pkgs/by-name/li/libmatroska/package.nix
+++ b/pkgs/by-name/li/libmatroska/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   cmake,
   libebml,
+  nix-update-script,
   pkg-config,
   testers,
   validatePkgConfig,
@@ -38,6 +39,12 @@ stdenv.mkDerivation rec {
 
   passthru = {
     tests.pkg-config = testers.hasPkgConfigModules { package = libmatroska; };
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version-regex"
+        "release-(.*)"
+      ];
+    };
   };
 
   meta = {

From 5cdc4888b4ea4492313dbf5c750b85d88faa6598 Mon Sep 17 00:00:00 2001
From: Jonas <git@finkler.me>
Date: Fri, 30 Aug 2024 13:34:14 +0200
Subject: [PATCH 10/93] sirius: Add option to build python bindings

---
 pkgs/by-name/si/sirius/package.nix | 44 ++++++++++++++++++++----------
 1 file changed, 30 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/si/sirius/package.nix b/pkgs/by-name/si/sirius/package.nix
index a962da0c865a..8ba0813e54f1 100644
--- a/pkgs/by-name/si/sirius/package.nix
+++ b/pkgs/by-name/si/sirius/package.nix
@@ -21,6 +21,8 @@
 , boost
 , eigen
 , libvdwxc
+, enablePython ? false
+, pythonPackages ? null
 , llvmPackages
 , cudaPackages
 , rocmPackages
@@ -35,6 +37,7 @@
 }:
 
 assert builtins.elem gpuBackend [ "none" "cuda" "rocm" ];
+assert enablePython -> pythonPackages != null;
 
 stdenv.mkDerivation rec {
   pname = "SIRIUS";
@@ -81,10 +84,23 @@ stdenv.mkDerivation rec {
   ] ++ lib.optionals (gpuBackend == "rocm") [
     rocmPackages.clr
     rocmPackages.rocblas
-  ] ++ lib.optional stdenv.isDarwin llvmPackages.openmp
-  ;
+  ] ++ lib.optionals stdenv.isDarwin [
+    llvmPackages.openmp
+  ] ++ lib.optionals enablePython (with pythonPackages; [
+    python
+    pybind11
+  ]);
 
-  propagatedBuildInputs = [ (lib.getBin mpi) ];
+  propagatedBuildInputs = [
+    (lib.getBin mpi)
+  ] ++ lib.optionals enablePython (with pythonPackages; [
+    mpi4py
+    voluptuous
+    numpy
+    h5py
+    scipy
+    pyyaml
+  ]);
 
   CXXFLAGS = [
     # GCC 13: error: 'uintptr_t' in namespace 'std' does not name a type
@@ -92,20 +108,20 @@ stdenv.mkDerivation rec {
   ];
 
   cmakeFlags = [
-    "-DUSE_SCALAPACK=ON"
+    "-DSIRIUS_USE_SCALAPACK=ON"
+    "-DSIRIUS_USE_VDWXC=ON"
+    "-DSIRIUS_CREATE_FORTRAN_BINDINGS=ON"
+    "-DSIRIUS_USE_OPENMP=ON"
     "-DBUILD_TESTING=ON"
-    "-DUSE_VDWXC=ON"
-    "-DCREATE_FORTRAN_BINDINGS=ON"
-    "-DUSE_OPENMP=ON"
-    "-DBUILD_TESTING=ON"
-  ]
-  ++ lib.optionals (gpuBackend == "cuda") [
-    "-DUSE_CUDA=ON"
+  ] ++ lib.optionals (gpuBackend == "cuda") [
+    "-DSIRIUS_USE_CUDA=ON"
     "-DCUDA_TOOLKIT_ROOT_DIR=${cudaPackages.cudatoolkit}"
-  ]
-  ++ lib.optionals (gpuBackend == "rocm") [
-    "-DUSE_ROCM=ON"
+    (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString)
+  ] ++ lib.optionals (gpuBackend == "rocm") [
+    "-DSIRIUS_USE_ROCM=ON"
     "-DHIP_ROOT_DIR=${rocmPackages.clr}"
+  ] ++ lib.optionals enablePython [
+    "-DSIRIUS_CREATE_PYTHON_MODULE=ON"
   ];
 
   doCheck = true;

From c2f9a2c471a7c372597b4e0b93740b56d2f849e3 Mon Sep 17 00:00:00 2001
From: Jonas <git@finkler.me>
Date: Fri, 30 Aug 2024 13:35:23 +0200
Subject: [PATCH 11/93] python3Packages.sirius: init at 7.6.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index adf16544281c..5b289889f965 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14532,6 +14532,11 @@ self: super: with self; {
 
   sipyco = callPackage ../development/python-modules/sipyco { };
 
+  sirius = toPythonModule (pkgs.sirius.override {
+    enablePython = true;
+    pythonPackages = self;
+  });
+
   sismic = callPackage ../development/python-modules/sismic { };
 
   sisyphus-control = callPackage ../development/python-modules/sisyphus-control { };

From 585af9ec70b6048639bfc492163875aed3c11e55 Mon Sep 17 00:00:00 2001
From: Jonas <git@finkler.me>
Date: Fri, 30 Aug 2024 13:37:35 +0200
Subject: [PATCH 12/93] umpire: Add cuda support

---
 pkgs/by-name/um/umpire/package.nix | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/um/umpire/package.nix b/pkgs/by-name/um/umpire/package.nix
index 17fae99e313f..54340d3fdeca 100644
--- a/pkgs/by-name/um/umpire/package.nix
+++ b/pkgs/by-name/um/umpire/package.nix
@@ -2,8 +2,13 @@
 , lib
 , fetchFromGitHub
 , cmake
+, config
+, cudaSupport ? config.cudaSupport
+, cudaPackages ? null
 }:
 
+assert cudaSupport -> cudaPackages != null;
+
 stdenv.mkDerivation rec {
   pname = "umpire";
   version = "2024.07.0";
@@ -16,7 +21,22 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+  ] ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_nvcc
+  ];
+
+  buildInputs = lib.optionals cudaSupport (with cudaPackages; [
+    cudatoolkit
+    cuda_cudart
+  ]);
+
+  cmakeFlags = lib.optionals cudaSupport [
+    "-DCUDA_TOOLKIT_ROOT_DIR=${cudaPackages.cudatoolkit}"
+    "-DENABLE_CUDA=ON"
+    (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString)
+  ];
 
   meta = with lib; {
     description = "Application-focused API for memory management on NUMA & GPU architectures";

From ce10ce52b94f4e8dd48ac13fee7563b951b2c27c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 10 Sep 2024 12:29:01 +0000
Subject: [PATCH 13/93] plasticity: 24.1.8 -> 24.2.0

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

diff --git a/pkgs/by-name/pl/plasticity/package.nix b/pkgs/by-name/pl/plasticity/package.nix
index dcc33000da72..08e4020ca72e 100644
--- a/pkgs/by-name/pl/plasticity/package.nix
+++ b/pkgs/by-name/pl/plasticity/package.nix
@@ -33,11 +33,11 @@
 }:
 stdenv.mkDerivation rec  {
   pname = "plasticity";
-  version = "24.1.8";
+  version = "24.2.0";
 
   src = fetchurl {
     url = "https://github.com/nkallen/plasticity/releases/download/v${version}/Plasticity-${version}-1.x86_64.rpm";
-    hash = "sha256-Hh1yf3JqzMEvorWztLvoTcnDAk48cNe7NcCLrvNQCzo=";
+    hash = "sha256-3dHS7chTgoD35AV/q8DHIYl43KbCsoFYEqSQHXm05tg=";
   };
 
   passthru.updateScript = ./update.sh;

From 4584a58c0dfd965946be5b2f079f464ae0ee3632 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 16 Aug 2024 19:26:16 +0200
Subject: [PATCH 14/93] nix.stable.tests.nix-fallback-paths: Allow
 cross-compiled store path name

Nix 2.24 has a riscv5-linux path that's cross-compiled
e.g. nix-riscv64-unknown-linux-gnu-2.24.2
---
 pkgs/tools/package-management/nix/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 35edaf2bef46..712055bfba29 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -115,7 +115,9 @@ let
         runCommand "test-nix-fallback-paths-version-equals-nix-stable" {
           paths = lib.concatStringsSep "\n" (builtins.attrValues (import ../../../../nixos/modules/installer/tools/nix-fallback-paths.nix));
         } ''
-          if [[ "" != $(grep -v 'nix-${pkg.version}$' <<< "$paths") ]]; then
+          # NOTE: name may contain cross compilation details between the pname
+          #       and version this is permitted thanks to ([^-]*-)*
+          if [[ "" != $(grep -vE 'nix-([^-]*-)*${lib.strings.replaceStrings ["."] ["\\."] pkg.version}$' <<< "$paths") ]]; then
             echo "nix-fallback-paths not up to date with nixVersions.stable (nix-${pkg.version})"
             echo "The following paths are not up to date:"
             grep -v 'nix-${pkg.version}$' <<< "$paths"

From 2e702d07bbf4fc97d97a25a180431e826b38ac30 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 16 Aug 2024 19:28:06 +0200
Subject: [PATCH 15/93] nix: nix_2_18 -> nix_2_24

---
 nixos/modules/installer/tools/nix-fallback-paths.nix | 11 ++++++-----
 pkgs/tools/package-management/nix/default.nix        |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix
index f9ea7eb39597..75ade3865833 100644
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,7 +1,8 @@
 {
-  x86_64-linux = "/nix/store/f409bhlpp0xkzvdz95qr2yvfjfi8r9jc-nix-2.18.5";
-  i686-linux = "/nix/store/ra39jzrxq3bcpf55aahwv5037akvylf5-nix-2.18.5";
-  aarch64-linux = "/nix/store/xiw8a4jbnw18svgdb04hyqzg5bsjspqf-nix-2.18.5";
-  x86_64-darwin = "/nix/store/k2gzx7i90x3h2c8g6xdi1jkwbl6ic895-nix-2.18.5";
-  aarch64-darwin = "/nix/store/rqwymbndaqxma6p8s5brcl9k32n5xx54-nix-2.18.5";
+  x86_64-linux = "/nix/store/b9kk9p6ankg080wh70smhg44dyan78kn-nix-2.24.2";
+  i686-linux = "/nix/store/nin0kajw977j8hhbyamgv5mkclssr03x-nix-2.24.2";
+  aarch64-linux = "/nix/store/pghw4m535hnrwkdlm7bamxca6lbx6n7z-nix-2.24.2";
+  riscv64-linux = "/nix/store/jcva3mcba7qn4waxkmv77w2r44q7wmq0-nix-riscv64-unknown-linux-gnu-2.24.2";
+  x86_64-darwin = "/nix/store/fkvinbdryqr854hk9i9hpdcqqaqln39m-nix-2.24.2";
+  aarch64-darwin = "/nix/store/z9j3va2vs4ycl9nxxph335c3jf47l27h-nix-2.24.2";
 }
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 712055bfba29..a5c4c03b3a09 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -241,7 +241,7 @@ in lib.makeExtensible (self: ({
     else
       nix;
 
-  stable = addFallbackPathsCheck self.nix_2_18;
+  stable = addFallbackPathsCheck self.nix_2_24;
 } // lib.optionalAttrs config.allowAliases (
   lib.listToAttrs (map (
     minor:

From 131b8e5fe6eafcc10d96e3d81d7a3841e099657f Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sat, 17 Aug 2024 12:30:27 +0200
Subject: [PATCH 16/93] nixVersions.*: Add tests.nixpkgs-lib

---
 pkgs/tools/package-management/nix/common.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix
index 205cda250e21..7b512b9dcc39 100644
--- a/pkgs/tools/package-management/nix/common.nix
+++ b/pkgs/tools/package-management/nix/common.nix
@@ -86,6 +86,7 @@ in
   # passthru tests
 , pkgsi686Linux
 , runCommand
+, pkgs
 }: let
 self = stdenv.mkDerivation {
   pname = "nix";
@@ -278,6 +279,12 @@ self = stdenv.mkDerivation {
         fi
         touch $out
       '';
+
+      /** Intended to test `lib`, but also a good smoke test for Nix */
+      nixpkgs-lib = import ../../../../lib/tests/test-with-nix.nix {
+        inherit lib pkgs;
+        nix = self;
+      };
     };
   };
 

From 556d5d4789f3333c780c5734882452eed33e1376 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sat, 17 Aug 2024 14:15:07 +0200
Subject: [PATCH 17/93] nixos/rl-2411: Add Nix update

---
 nixos/doc/manual/release-notes/rl-2411.section.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index a3042b88bf5f..c5f08a75035e 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -8,6 +8,14 @@
   Starting with release 25.05, the minimum supported version will be macOS Big Sur 11, and we cannot guarantee that packages will continue to work on older versions of macOS.
   Users on old macOS versions should consider upgrading to a supported version (potentially using [OpenCore Legacy Patcher](https://dortania.github.io/OpenCore-Legacy-Patcher/) for old hardware) or installing NixOS.
   If neither of those options are viable and you require new versions of software, [MacPorts](https://www.macports.org/) supports back to Mac OS X Snow Leopard 10.6.
+- Nix was updated to 2.24, which brings a lot of improvements and fixes. See the release notes for
+    [2.19](https://nix.dev/manual/nix/latest/release-notes/rl-2.19),
+    [2.20](https://nix.dev/manual/nix/latest/release-notes/rl-2.20),
+    [2.21](https://nix.dev/manual/nix/latest/release-notes/rl-2.21),
+    [2.22](https://nix.dev/manual/nix/latest/release-notes/rl-2.22),
+    [2.23](https://nix.dev/manual/nix/latest/release-notes/rl-2.23),
+    [2.24](https://nix.dev/manual/nix/latest/release-notes/rl-2.24).
+  Notable changes include improvements to Git fetching, documentation comment support in `nix-repl> :doc`, as well as many quality of life improvements.
 
 - Convenience options for `amdgpu`, open source driver for Radeon cards, is now available under `hardware.amdgpu`.
 

From 12829a17fdadb32ec8351103c633bacdb0ed6fd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 17 Aug 2024 22:13:33 +0200
Subject: [PATCH 18/93] nix-doc: disable nix-doc

---
 pkgs/tools/package-management/nix-doc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/nix-doc/default.nix b/pkgs/tools/package-management/nix-doc/default.nix
index 53b05bccf349..f7b3777f7f23 100644
--- a/pkgs/tools/package-management/nix-doc/default.nix
+++ b/pkgs/tools/package-management/nix-doc/default.nix
@@ -6,7 +6,7 @@
 , nix
 , pkg-config
 # Whether to build the nix-doc plugin for Nix
-, withPlugin ? true
+, withPlugin ? false # no longer needed for nix 2.24
 }:
 
 let

From 029116732305987878ffc9714829cc770e786a6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Sat, 17 Aug 2024 22:23:58 +0200
Subject: [PATCH 19/93] nix-plugins: 14.0.0 -> 15.0.0

Fixes build with newer Nix
---
 pkgs/development/libraries/nix-plugins/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix
index 8714c6b4037a..0da1d1d917f2 100644
--- a/pkgs/development/libraries/nix-plugins/default.nix
+++ b/pkgs/development/libraries/nix-plugins/default.nix
@@ -2,18 +2,21 @@
 
 stdenv.mkDerivation rec {
   pname = "nix-plugins";
-  version = "14.0.0";
+  version = "15.0.0";
 
   src = fetchFromGitHub {
     owner = "shlevy";
     repo = "nix-plugins";
     rev = version;
-    hash = "sha256-RDKAuLwcZ3Pbn5JUDmGBcfD0xbM6Jud2ouXh/YKpfS8=";
+    hash = "sha256-C4VqKHi6nVAHuXVhqvTRRyn0Bb619ez4LzgUWPH1cbM=";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];
 
-  buildInputs = [ nix boost ];
+  buildInputs = [
+    nix
+    boost
+  ];
 
   meta = {
     description = "Collection of miscellaneous plugins for the nix expression language";

From 0c4c9798243c384894a86cff58529a02302b0b6d Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Thu, 12 Sep 2024 17:53:59 +0200
Subject: [PATCH 20/93] libdatachannel: format and allow building on darwin

---
 .../libraries/libdatachannel/default.nix      | 34 +++++++++++--------
 1 file changed, 20 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/libraries/libdatachannel/default.nix b/pkgs/development/libraries/libdatachannel/default.nix
index d5e5f1db552a..bc831d354e77 100644
--- a/pkgs/development/libraries/libdatachannel/default.nix
+++ b/pkgs/development/libraries/libdatachannel/default.nix
@@ -1,14 +1,15 @@
-{ stdenv
-, lib
-, fetchFromGitHub
-, cmake
-, ninja
-, pkg-config
-, libnice
-, openssl
-, plog
-, srtp
-, usrsctp
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  ninja,
+  pkg-config,
+  libnice,
+  openssl,
+  plog,
+  srtp,
+  usrsctp,
 }:
 
 stdenv.mkDerivation rec {
@@ -22,14 +23,19 @@ stdenv.mkDerivation rec {
     hash = "sha256-3fax57oaJvOgbTDPCiiUdtsfAGhICfPkuMihawq06SA=";
   };
 
-  outputs = [ "out" "dev" ];
+  outputs = [
+    "out"
+    "dev"
+  ];
 
   strictDeps = true;
+
   nativeBuildInputs = [
     cmake
     ninja
     pkg-config
   ];
+
   buildInputs = [
     libnice
     openssl
@@ -47,7 +53,7 @@ stdenv.mkDerivation rec {
   postFixup = ''
     # Fix include path that will be incorrect due to the "dev" output
     substituteInPlace "$dev/lib/cmake/LibDataChannel/LibDataChannelTargets.cmake" \
-      --replace "\''${_IMPORT_PREFIX}/include" "$dev/include"
+      --replace-fail "\''${_IMPORT_PREFIX}/include" "$dev/include"
   '';
 
   meta = with lib; {
@@ -55,6 +61,6 @@ stdenv.mkDerivation rec {
     homepage = "https://libdatachannel.org/";
     license = with licenses; [ mpl20 ];
     maintainers = with maintainers; [ erdnaxe ];
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }

From 457e409607d806c8de78aeda885af901d3aa1c4f Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Thu, 12 Sep 2024 16:49:35 +0200
Subject: [PATCH 21/93] httptoolkit-server: init at 1.19.0

---
 .../only-build-for-one-platform.patch         |  39 ++++
 .../by-name/ht/httptoolkit-server/package.nix | 173 ++++++++++++++++++
 2 files changed, 212 insertions(+)
 create mode 100644 pkgs/by-name/ht/httptoolkit-server/only-build-for-one-platform.patch
 create mode 100644 pkgs/by-name/ht/httptoolkit-server/package.nix

diff --git a/pkgs/by-name/ht/httptoolkit-server/only-build-for-one-platform.patch b/pkgs/by-name/ht/httptoolkit-server/only-build-for-one-platform.patch
new file mode 100644
index 000000000000..3d36c01d2ca4
--- /dev/null
+++ b/pkgs/by-name/ht/httptoolkit-server/only-build-for-one-platform.patch
@@ -0,0 +1,39 @@
+diff --git a/pack.ts b/pack.ts
+index aba98cc..03ce86a 100644
+--- a/pack.ts
++++ b/pack.ts
+@@ -75,33 +75,7 @@ const packageApp = async () => {
+     delete pJson.scripts.prepack; // We don't want to rebuild - all built code will be in the packed content
+     await fs.writeJson(path.join(OUTPUT_DIR, 'package.json'), pJson);
+ 
+-    const buildScript = path.join(OUTPUT_DIR, 'build-release.sh');
+-
+-    // Run build-release in this folder, for each platform. For each bundle, we copy in
+-    // only the relevant platform-specific NSS files.
+-    console.log('Building for Linux');
+-    await fs.mkdir(path.join(OUTPUT_DIR, 'nss'));
+-    await fs.copy(path.join(__dirname, 'nss', 'linux'), path.join(OUTPUT_DIR, 'nss', 'linux'));
+-    await spawn(buildScript, ['linux'], { cwd: OUTPUT_DIR, stdio: 'inherit' });
+-
+-    console.log('Building for Darwin');
+-    await fs.remove(path.join(OUTPUT_DIR, 'nss', 'linux'));
+-    await fs.copy(path.join(__dirname, 'nss', 'darwin'), path.join(OUTPUT_DIR, 'nss', 'darwin'));
+-    await spawn(buildScript, ['darwin'], { cwd: OUTPUT_DIR, stdio: 'inherit' });
+-
+-    console.log('Building for Win32');
+-    await fs.remove(path.join(OUTPUT_DIR, 'nss', 'darwin'));
+-    await fs.copy(path.join(__dirname, 'nss', 'win32'), path.join(OUTPUT_DIR, 'nss', 'win32'));
+-    await spawn(buildScript, ['win32'], { cwd: OUTPUT_DIR, stdio: 'inherit' });
+-
+-    // Oclif builds a nodeless platform-agnostic bundle too (although in our case, nothing is
+-    // really platform agnostic). Not necessary, probably won't work - drop it.
+-    await fs.remove(path.join(
+-        OUTPUT_DIR,
+-        'dist',
+-        `v${pJson.version}`,
+-        `httptoolkit-server-v${pJson.version}.tar.gz`
+-    ));
++    await spawn('npm', ['exec', '--', 'oclif-dev', 'pack', '--targets=linux-x64'], { cwd: OUTPUT_DIR, stdio: 'inherit' });
+ }
+ 
+ packageApp().catch(e => {
diff --git a/pkgs/by-name/ht/httptoolkit-server/package.nix b/pkgs/by-name/ht/httptoolkit-server/package.nix
new file mode 100644
index 000000000000..1bc90738b120
--- /dev/null
+++ b/pkgs/by-name/ht/httptoolkit-server/package.nix
@@ -0,0 +1,173 @@
+{
+  lib,
+  nodejs_20,
+  buildNpmPackage,
+  fetchFromGitHub,
+  writeShellScriptBin,
+  nss,
+  cmake,
+  pkg-config,
+  openssl,
+  libdatachannel,
+}:
+
+let
+  nodejs = nodejs_20;
+  buildNpmPackage' = buildNpmPackage.override { inherit nodejs; };
+
+  version = "1.19.0";
+
+  src = fetchFromGitHub {
+    owner = "httptoolkit";
+    repo = "httptoolkit-server";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-S4Io4X5Hlvm/5HoKIQ/OTor9jZvMz6me5RyfZ8FwOdM=";
+  };
+
+  overridesNodeModules = buildNpmPackage' {
+    pname = "httptoolkit-server-overrides-node-modules";
+    inherit version src;
+    sourceRoot = "${src.name}/overrides/js";
+
+    npmDepsHash = "sha256-GRN6ua3FY1AE61bB7PM2wgbKPZI/zJeXa5HOOh/2N2Y=";
+
+    dontBuild = true;
+
+    installPhase = ''
+      mkdir -p $out
+      cp -r node_modules $out/node_modules
+    '';
+  };
+
+  nodeDatachannel = buildNpmPackage' {
+    pname = "node-datachannel";
+    version = "0.4.3";
+
+    src = fetchFromGitHub {
+      owner = "murat-dogan";
+      repo = "node-datachannel";
+      rev = "refs/tags/v${nodeDatachannel.version}";
+      hash = "sha256-BlfeocqSG+pqbK0onnCf0VKbQw8Qq4qMxhAcfGlFYR8=";
+    };
+
+    npmFlags = [ "--ignore-scripts" ];
+
+    makeCacheWritable = true;
+
+    npmDepsHash = "sha256-pgcOOjiuWKlpD+WJyPj/c9ZhDjYuEnybpLS/BPmzeFM=";
+
+    nativeBuildInputs = [
+      cmake
+      pkg-config
+    ];
+
+    buildInputs = [
+      openssl
+      libdatachannel
+    ];
+
+    dontUseCmakeConfigure = true;
+
+    env.NIX_CFLAGS_COMPILE = "-I${nodejs}/include/node";
+    env.CXXFLAGS = "-include stdexcept"; # for GCC13
+
+    preBuild = ''
+      # don't use static libs and don't use FetchContent
+      substituteInPlace CMakeLists.txt \
+          --replace-fail 'OPENSSL_USE_STATIC_LIBS TRUE' 'OPENSSL_USE_STATIC_LIBS FALSE' \
+          --replace-fail 'if(NOT libdatachannel)' 'if(false)' \
+          --replace-fail 'datachannel-static' 'datachannel'
+
+      # don't fetch node headers
+      substituteInPlace node_modules/cmake-js/lib/dist.js \
+          --replace-fail '!this.downloaded' 'false'
+
+      npm rebuild --verbose
+    '';
+
+    installPhase = ''
+      runHook preInstall
+      install -Dm755 build/Release/*.node -t $out/build/Release
+      runHook postInstall
+    '';
+  };
+in
+buildNpmPackage' {
+  pname = "httptoolkit-server";
+  inherit version src;
+
+  patches = [ ./only-build-for-one-platform.patch ];
+
+  npmDepsHash = "sha256-njSNdpo+CIfS9LTnshawJ7297tFc8ssjUqJcHk8kBZE=";
+
+  npmFlags = [ "--ignore-scripts" ];
+
+  makeCacheWritable = true;
+
+  nativeBuildInputs = [
+    # the build system uses the `git` executable to get the current revision
+    # we use a fake git to provide it with a fake revision
+    (writeShellScriptBin "git" "echo '???'")
+  ];
+
+  postConfigure = ''
+    # make sure `oclif-dev' doesn't fetch `node` binary to bundle with the app
+    substituteInPlace node_modules/@oclif/dev-cli/lib/tarballs/node.js --replace-fail \
+        'async function fetchNodeBinary({ nodeVersion, output, platform, arch, tmp }) {' \
+        'async function fetchNodeBinary({ nodeVersion, output, platform, arch, tmp }) { return;'
+
+    # manually place our prebuilt `node-datachannel` binary into its place, since we used '--ignore-scripts'
+    ln -s ${nodeDatachannel}/build node_modules/node-datachannel/build
+
+    cp -r ${overridesNodeModules}/node_modules overrides/js/node_modules
+
+    # don't run `npm ci` in `overrides/js` since we already copied node_modules into the directory
+    substituteInPlace prepare.ts --replace-fail "'ci', '--production'" "'--version'"
+
+    patchShebangs *.sh
+  '';
+
+  preBuild = ''
+    npm run build:src
+  '';
+
+  npmBuildScript = "build:release";
+
+  installPhase = ''
+    runHook preInstall
+
+    # we don't actually use any of the generated tarballs, we just copy from the tmp directory, since that's easier
+    mkdir -p $out/share/httptoolkit-server
+    cp -r build/tmp/httptoolkit-server/* -r $out/share/httptoolkit-server
+
+    # remove unneeded executables
+    rm -r $out/share/httptoolkit-server/bin/httptoolkit-server*
+
+    # since `oclif-dev pack` ran `npm install` again, we need to place the prebuilt binary here again
+    ln -s ${nodeDatachannel}/build $out/share/httptoolkit-server/node_modules/node-datachannel/build
+
+    # disable updating functionality
+    substituteInPlace $out/share/httptoolkit-server/node_modules/@oclif/plugin-update/lib/commands/update.js \
+        --replace-fail "await this.skipUpdate()" "'cannot update nix based package'"
+
+    # the app determines if it's in production by checking if HTTPTOOLKIT_SERVER_BINPATH is set to anything
+    makeWrapper $out/share/httptoolkit-server/bin/run $out/bin/httptoolkit-server \
+        --set HTTPTOOLKIT_SERVER_BINPATH dummy \
+        --prefix PATH : ${lib.makeBinPath [ nss.tools ]}
+
+    runHook postInstall
+  '';
+
+  passthru = {
+    inherit nodeDatachannel;
+  };
+
+  meta = {
+    description = "Backend for HTTP Toolkit";
+    homepage = "https://httptoolkit.com/";
+    license = lib.licenses.agpl3Plus;
+    mainProgram = "httptoolkit-server";
+    maintainers = with lib.maintainers; [ tomasajt ];
+    platforms = lib.platforms.unix;
+  };
+}

From 7b9fb850e79a0345d29d388f5b420dc661bd0e89 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Thu, 12 Sep 2024 16:49:41 +0200
Subject: [PATCH 22/93] httptoolkit: init at 1.19.0

---
 pkgs/by-name/ht/httptoolkit/package.nix | 101 ++++++++++++++++++++++++
 1 file changed, 101 insertions(+)
 create mode 100644 pkgs/by-name/ht/httptoolkit/package.nix

diff --git a/pkgs/by-name/ht/httptoolkit/package.nix b/pkgs/by-name/ht/httptoolkit/package.nix
new file mode 100644
index 000000000000..173e093cb71c
--- /dev/null
+++ b/pkgs/by-name/ht/httptoolkit/package.nix
@@ -0,0 +1,101 @@
+{
+  lib,
+  stdenv,
+  buildNpmPackage,
+  fetchFromGitHub,
+  makeWrapper,
+  makeDesktopItem,
+  copyDesktopItems,
+  electron,
+  httptoolkit-server,
+}:
+
+buildNpmPackage rec {
+  pname = "httptoolkit";
+  version = "1.19.0";
+
+  src = fetchFromGitHub {
+    owner = "httptoolkit";
+    repo = "httptoolkit-desktop";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-e+ngBZMwMTvwzY1K7IaxlNoRkZUPDdJvKxvxuCsc9pw=";
+  };
+
+  npmDepsHash = "sha256-XgJIs4P1ezCEPPitIIfYpNkX0/3dPdajeIiDwHm7DSU=";
+
+  env = {
+    ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
+    # disable code signing on Darwin
+    CSC_IDENTITY_AUTO_DISCOVERY = "false";
+  };
+
+  nativeBuildInputs = [ makeWrapper ] ++ lib.optionals stdenv.isLinux [ copyDesktopItems ];
+
+  npmBuildScript = "build:src";
+
+  postBuild = ''
+    substituteInPlace package.json --replace-fail \
+        '"forceCodeSigning": true' \
+        '"forceCodeSigning": false'
+
+    cp -r ${electron.dist} electron-dist
+    chmod -R u+w electron-dist
+
+    npm exec electron-builder -- \
+        --dir \
+        -c.electronDist=electron-dist \
+        -c.electronVersion=${electron.version}
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    ${lib.optionalString stdenv.isLinux ''
+      mkdir -p $out/share/httptoolkit
+      cp -r dist/*-unpacked/{locales,resources{,.pak}} $out/share/httptoolkit
+
+      ln -s ${httptoolkit-server} $out/share/httptoolkit/resources/httptoolkit-server
+
+      install -Dm644 src/icons/icon.svg $out/share/icons/hicolor/scalable/apps/httptoolkit.svg
+
+      makeWrapper ${lib.getExe electron} $out/bin/httptoolkit \
+          --add-flags $out/share/httptoolkit/resources/app.asar \
+          --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \
+          --inherit-argv0
+    ''}
+
+    ${lib.optionalString stdenv.isDarwin ''
+      mkdir -p $out/Applications
+      cp -r dist/mac*/"HTTP Toolkit.app" $out/Applications
+
+      ln -s ${httptoolkit-server} "$out/Applications/HTTP Toolkit.app/Contents/Resources/httptoolkit-server"
+
+      makeWrapper "$out/Applications/HTTP Toolkit.app/Contents/MacOS/HTTP Toolkit" $out/bin/httptoolkit
+    ''}
+
+    runHook postInstall
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "httptoolkit";
+      desktopName = "HTTP Toolkit";
+      exec = "httptoolkit %U";
+      terminal = false;
+      icon = "httptoolkit";
+      startupWMClass = "HTTP Toolkit";
+      comment = meta.description;
+      categories = [ "Development" ];
+      startupNotify = true;
+    })
+  ];
+
+  meta = {
+    description = "HTTP(S) debugging, development & testing tool";
+    homepage = "https://httptoolkit.com/";
+    license = lib.licenses.agpl3Plus;
+    mainProgram = "httptoolkit";
+    maintainers = with lib.maintainers; [ tomasajt ];
+    platforms = electron.meta.platforms;
+  };
+}

From 2f95b266775689a2e3e2cf7df05fcda8762c0656 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 13 Sep 2024 05:34:29 +0000
Subject: [PATCH 23/93] ipget: 0.10.0 -> 0.11.0

---
 pkgs/applications/networking/ipget/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/ipget/default.nix b/pkgs/applications/networking/ipget/default.nix
index 0ad7de8ec468..4beb88feca1f 100644
--- a/pkgs/applications/networking/ipget/default.nix
+++ b/pkgs/applications/networking/ipget/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "ipget";
-  version = "0.10.0";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "ipfs";
     repo = "ipget";
     rev = "v${version}";
-    hash = "sha256-nT0bMy4L1T2rwE6g3Q4tNkmeP3XyPVxCV9yoGqMZjNs=";
+    hash = "sha256-SCYbfsQ8yF2ggwNyW0+kydpSBQN9NPpz1Hmw4ni3cg0=";
   };
 
-  vendorHash = "sha256-q8uwijh3y4l4ebFc3u5Z6TLUUiQqUK6Qpqq/m0kLF14=";
+  vendorHash = "sha256-90iimOtFys12nrT0hHyzHrpB03YGNfHY/a7V8Blijfw=";
 
   postPatch = ''
     # main module (github.com/ipfs/ipget) does not contain package github.com/ipfs/ipget/sharness/dependencies

From 483b8847c2d766d60189438aee547b14236b8276 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 13 Sep 2024 05:48:47 +0000
Subject: [PATCH 24/93] last-resort: 15.100 -> 16.000

---
 pkgs/data/fonts/last-resort/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/last-resort/default.nix b/pkgs/data/fonts/last-resort/default.nix
index 10d820bf5f7f..87fb95e96035 100644
--- a/pkgs/data/fonts/last-resort/default.nix
+++ b/pkgs/data/fonts/last-resort/default.nix
@@ -2,11 +2,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "last-resort";
-  version = "15.100";
+  version = "16.000";
 
   src = fetchurl {
     url = "https://github.com/unicode-org/last-resort-font/releases/download/${version}/LastResortHE-Regular.ttf";
-    hash = "sha256-dPk6j7Orh1bg6GyzwsB4P9oQvepvl51YF4abpyhOVso=";
+    hash = "sha256-YMSKv8BenyujNZnE3LpAEF0eznHTdh8LJvdaOLWxeJU=";
   };
 
   dontUnpack = true;

From be83fcde7dae676ac077b352153a93af0df71d49 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 13 Sep 2024 12:12:01 +0200
Subject: [PATCH 25/93] nix.tests.nixStatic: init

This formalizes lf-'s suggestion
https://github.com/NixOS/nixpkgs/pull/335342#issuecomment-2294899692

> nixStatic should be a hard blocker [when updating Nix]
---
 pkgs/tools/package-management/nix/common.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/package-management/nix/common.nix b/pkgs/tools/package-management/nix/common.nix
index 7b512b9dcc39..0b8995f30607 100644
--- a/pkgs/tools/package-management/nix/common.nix
+++ b/pkgs/tools/package-management/nix/common.nix
@@ -85,6 +85,7 @@ in
 
   # passthru tests
 , pkgsi686Linux
+, pkgsStatic
 , runCommand
 , pkgs
 }: let
@@ -260,6 +261,8 @@ self = stdenv.mkDerivation {
 
     tests = {
       nixi686 = pkgsi686Linux.nixVersions.${self_attribute_name};
+      nixStatic = pkgsStatic.nixVersions.${self_attribute_name};
+
       # Basic smoke test that needs to pass when upgrading nix.
       # Note that this test does only test the nixVersions.stable attribute.
       misc = nixosTests.nix-misc.default;

From ac849e565872034155ccaaa0bf736a75f1073a6e Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 13 Sep 2024 13:37:46 +0200
Subject: [PATCH 26/93] nixos/nix-fallback-paths: 2.24.2 -> 2.24.6

---
 nixos/modules/installer/tools/nix-fallback-paths.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix
index 75ade3865833..10b2b5220e75 100644
--- a/nixos/modules/installer/tools/nix-fallback-paths.nix
+++ b/nixos/modules/installer/tools/nix-fallback-paths.nix
@@ -1,8 +1,8 @@
 {
-  x86_64-linux = "/nix/store/b9kk9p6ankg080wh70smhg44dyan78kn-nix-2.24.2";
-  i686-linux = "/nix/store/nin0kajw977j8hhbyamgv5mkclssr03x-nix-2.24.2";
-  aarch64-linux = "/nix/store/pghw4m535hnrwkdlm7bamxca6lbx6n7z-nix-2.24.2";
-  riscv64-linux = "/nix/store/jcva3mcba7qn4waxkmv77w2r44q7wmq0-nix-riscv64-unknown-linux-gnu-2.24.2";
-  x86_64-darwin = "/nix/store/fkvinbdryqr854hk9i9hpdcqqaqln39m-nix-2.24.2";
-  aarch64-darwin = "/nix/store/z9j3va2vs4ycl9nxxph335c3jf47l27h-nix-2.24.2";
+  x86_64-linux = "/nix/store/fmfy9zigxns8f1wfb4v2arf1jmfdjpjc-nix-2.24.6";
+  i686-linux = "/nix/store/bl95c09pcihf2fdqpzjyjk4bdq0bsizm-nix-2.24.6";
+  aarch64-linux = "/nix/store/2sbzgmvas19iq3nhg8xbnd8k0khahk34-nix-2.24.6";
+  riscv64-linux = "/nix/store/7yy1x9sx83wm77mjawd953d6a6wb669q-nix-riscv64-unknown-linux-gnu-2.24.6";
+  x86_64-darwin = "/nix/store/vs6bbxkwxqr828q8rj1xlbmsbnx1ry6z-nix-2.24.6";
+  aarch64-darwin = "/nix/store/d88r5b1qv1fvz2j9qndz8sr31mqgz45x-nix-2.24.6";
 }

From 4b5dd70639f13628744b32239b37f990cf8b4eb4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 14 Sep 2024 02:56:19 +0000
Subject: [PATCH 27/93] codeium: 1.14.15 -> 1.16.11

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

diff --git a/pkgs/by-name/co/codeium/package.nix b/pkgs/by-name/co/codeium/package.nix
index 19aeb59c7ad1..679050b5cc8a 100644
--- a/pkgs/by-name/co/codeium/package.nix
+++ b/pkgs/by-name/co/codeium/package.nix
@@ -13,10 +13,10 @@ let
   }.${system} or throwSystem;
 
   hash = {
-    x86_64-linux = "sha256-BPlegORfDeGBMexdkh+5clfxNqQ5FRawW8BJuzwowg0=";
-    aarch64-linux = "sha256-UPDA2wlf4K05JpeghHB+yeBFyMCXbZTDGrxFVyA1mlI=";
-    x86_64-darwin = "sha256-fVqHPfGJBMdEJn6EOh4eRVmPXhmoMskjdlmSls7sm/E=";
-    aarch64-darwin = "sha256-kIZYFgXj5vpZ1MwZqu1X4i/OZjfZMpvkceHzed8ZKP8=";
+    x86_64-linux = "sha256-xOP9NOcuBRrX998jF4dTpUtS9jPux4jHu057sPPjGWA=";
+    aarch64-linux = "sha256-RVy/k1nUbT0MGIuSnEJZqGM+kQhBEUSD/D2uk5ZmYzs=";
+    x86_64-darwin = "sha256-MtUAO6xvSDcLokjmW1CAOC8+3pTMFy1yteKmb/WUpGs=";
+    aarch64-darwin = "sha256-OZf74uvuka4S8JKYcGM1f8T2RrdTxelLMmx74Ee83ek=";
   }.${system} or throwSystem;
 
   bin = "$out/bin/codeium_language_server";
@@ -24,7 +24,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "codeium";
-  version = "1.14.15";
+  version = "1.16.11";
   src = fetchurl {
     name = "${finalAttrs.pname}-${finalAttrs.version}.gz";
     url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz";

From d919e8bfe401ea8bf306e1eb3ff881c7e5e0a05f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 14 Sep 2024 22:30:18 +0000
Subject: [PATCH 28/93] fable: 4.19.3 -> 4.20.0

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

diff --git a/pkgs/development/tools/fable/default.nix b/pkgs/development/tools/fable/default.nix
index 3bc1217a80da..ea5362daa90f 100644
--- a/pkgs/development/tools/fable/default.nix
+++ b/pkgs/development/tools/fable/default.nix
@@ -2,9 +2,9 @@
 
 buildDotnetGlobalTool {
   pname = "fable";
-  version = "4.19.3";
+  version = "4.20.0";
 
-  nugetHash = "sha256-+ZauUmFVDxnlSfYtNWaq5oCK2odTuBfFjKTo/POp0SQ=";
+  nugetHash = "sha256-K3908gEbl9crT4wmZfBtvag5Z6qYABfalBfLZlqZuDk=";
   passthru.updateScript = ./update.sh;
 
   meta = with lib; {

From 276333a8d658f3f9440a0332a8cf86ef43c284ea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Sep 2024 06:24:18 +0000
Subject: [PATCH 29/93] wavebox: 10.128.5-2 -> 10.128.7-2

---
 .../networking/instant-messengers/wavebox/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/wavebox/default.nix b/pkgs/applications/networking/instant-messengers/wavebox/default.nix
index cc244f0c0e4e..211f1af8726e 100644
--- a/pkgs/applications/networking/instant-messengers/wavebox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/wavebox/default.nix
@@ -156,11 +156,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "wavebox";
-  version = "10.128.5-2";
+  version = "10.128.7-2";
 
   src = fetchurl {
     url = "https://download.wavebox.app/stable/linux/deb/amd64/wavebox_${finalAttrs.version}_amd64.deb";
-    hash = "sha256-eIiFiRlmnARtyd8YHUHrjDaaF8kQYvcOa2AwT3071Ho=";
+    hash = "sha256-MRMN/xVs80u3MfdQfALhPW7dpTZrjsVhMjEN/zl7K+U=";
   };
 
   nativeBuildInputs = [

From 8c1b12f8b7025d4cff4eca9e308870ad74c06266 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 15 Sep 2024 11:25:44 +0200
Subject: [PATCH 30/93] libcdr: enable parallel building

Tested at -j20.
---
 pkgs/development/libraries/libcdr/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/libcdr/default.nix b/pkgs/development/libraries/libcdr/default.nix
index 885413982dad..cf7d7c4e5e2e 100644
--- a/pkgs/development/libraries/libcdr/default.nix
+++ b/pkgs/development/libraries/libcdr/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
 
   CXXFLAGS="--std=gnu++0x"; # For c++11 constants in lcms2.h
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "Library providing ability to interpret and import Corel Draw drawings into various applications";
     homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libcdr";

From 114ae8cd1b3f362d042d8c32d921fccb9f0062ac Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 15 Sep 2024 11:27:13 +0200
Subject: [PATCH 31/93] libvisio: enable parallel building

Tested at -j20.
---
 pkgs/development/libraries/libvisio/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/libvisio/default.nix b/pkgs/development/libraries/libvisio/default.nix
index e6a425660cc8..4b66ef5b4e1d 100644
--- a/pkgs/development/libraries/libvisio/default.nix
+++ b/pkgs/development/libraries/libvisio/default.nix
@@ -32,6 +32,8 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  enableParallelBuilding = true;
+
   meta = with lib; {
     description = "Library providing ability to interpret and import visio diagrams into various applications";
     homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libvisio";

From b993f628a8ff54abf1f339ac8fdce33577d3238d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Sep 2024 11:29:01 +0000
Subject: [PATCH 32/93] handheld-daemon: 3.3.12 -> 3.3.15

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

diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix
index 5b09c6aaa239..9d816c17f61c 100644
--- a/pkgs/by-name/ha/handheld-daemon/package.nix
+++ b/pkgs/by-name/ha/handheld-daemon/package.nix
@@ -8,14 +8,14 @@
 }:
 python3.pkgs.buildPythonApplication rec {
   pname = "handheld-daemon";
-  version = "3.3.12";
+  version = "3.3.15";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "hhd-dev";
     repo = "hhd";
     rev = "refs/tags/v${version}";
-    hash = "sha256-3ne9e1rYjWe8opwOvtP5NJMNbTloWg1kj+JzckpeW1M=";
+    hash = "sha256-NniHOxe77hBHn81pVtlaSeIK+Hp+Lw3xBHolO6Acbho=";
   };
 
   propagatedBuildInputs = with python3.pkgs; [

From 2da68035ff2cb894a6c98afc2e5cd0d596edf783 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Sep 2024 12:45:17 +0000
Subject: [PATCH 33/93] gosec: 2.21.1 -> 2.21.2

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

diff --git a/pkgs/development/tools/gosec/default.nix b/pkgs/development/tools/gosec/default.nix
index d9937e56764a..a2c6cd85e5ed 100644
--- a/pkgs/development/tools/gosec/default.nix
+++ b/pkgs/development/tools/gosec/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "gosec";
-  version = "2.21.1";
+  version = "2.21.2";
 
   src = fetchFromGitHub {
     owner = "securego";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-0YSDeJEX7dAxIxW+dTiZtsieafzDRADggMBnJ3Sjjow=";
+    hash = "sha256-1lVyIytIorxxipDZAf2AYqtO1Slz9aUw6MpC40ji89w=";
   };
 
-  vendorHash = "sha256-3O3uk/KB348++FAuH0WKTlqTK+RsDXkAXL3y4xud0r4=";
+  vendorHash = "sha256-jxbGAEvkjvuK878nkl8TGbZmBzS7n9nG4hH9BL3UGwE=";
 
   subPackages = [
     "cmd/gosec"

From b9d465144a8e6637c0057162dfdff9309a3ad2cb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Sep 2024 13:17:43 +0000
Subject: [PATCH 34/93] nsc: 2.8.8 -> 2.8.9

---
 pkgs/tools/system/nsc/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/system/nsc/default.nix b/pkgs/tools/system/nsc/default.nix
index e4775e7ebb84..f9aeba937a5f 100644
--- a/pkgs/tools/system/nsc/default.nix
+++ b/pkgs/tools/system/nsc/default.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "nsc";
-  version = "2.8.8";
+  version = "2.8.9";
 
   src = fetchFromGitHub {
     owner = "nats-io";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-ZaizxiNGiyV3Z18U4W2LcqZXDLfUB7NhuURNVbx6M4s=";
+    hash = "sha256-KNW9meeThHT9ZZJFXsb9RAzLsvgnaXWbuMR4tei/s2U=";
   };
 
   ldflags = [
@@ -23,7 +23,7 @@ buildGoModule rec {
     "-X main.builtBy=nixpkgs"
   ];
 
-  vendorHash = "sha256-+XSG5vDEGUYlORF9a15QnE2pueU8GN+UF7w7EtRArG8=";
+  vendorHash = "sha256-3qUgzvb7VkYrlYb+W0ZycJ0S7CQAHSUFNQSfwiKqMdI=";
 
   nativeBuildInputs = [ installShellFiles ];
 
@@ -46,7 +46,7 @@ buildGoModule rec {
   # the test strips table formatting from the command output in a naive way
   # that removes all the table characters, including '-'.
   # The nix build directory looks something like:
-  # /private/tmp/nix-build-nsc-2.8.8.drv-0/nsc_test2000598938/keys
+  # /private/tmp/nix-build-nsc-2.8.9.drv-0/nsc_test2000598938/keys
   # Then the `-` are removed from the path unintentionally and the test fails.
   # This should be fixed upstream to avoid mangling the path when
   # removing the table decorations from the command output.

From 61fcdd9ca1607e4b47cd3ed77e84e00c60a709c5 Mon Sep 17 00:00:00 2001
From: kilianar <mail@kilianar.de>
Date: Sun, 15 Sep 2024 15:32:13 +0200
Subject: [PATCH 35/93] hugo: 0.134.0 -> 0.134.2

https://github.com/gohugoio/hugo/releases/tag/v0.134.2
---
 pkgs/by-name/hu/hugo/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix
index 1c605b06eed2..439bc97d7a2d 100644
--- a/pkgs/by-name/hu/hugo/package.nix
+++ b/pkgs/by-name/hu/hugo/package.nix
@@ -10,13 +10,13 @@
 
 buildGo123Module rec {
   pname = "hugo";
-  version = "0.134.0";
+  version = "0.134.2";
 
   src = fetchFromGitHub {
     owner = "gohugoio";
     repo = "hugo";
     rev = "refs/tags/v${version}";
-    hash = "sha256-XglHrV+MD9Nq1qwJB63eATuS+6SwjZVF5u6H5EejEow=";
+    hash = "sha256-/jq8YMBgADC2Y98HzZNcDYZ9xhh6am6+G/dgouOGowE=";
   };
 
   vendorHash = "sha256-oDa5uWQ/vFSmTNwZ3zsYtsuLCzddV9DeaEGx5krwWRE=";

From 07b4ece5c88c5cd45533a57c83c5fe8ad600a5ce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Sep 2024 14:08:46 +0000
Subject: [PATCH 36/93] devpod: 0.5.19 -> 0.5.20

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

diff --git a/pkgs/development/tools/devpod/default.nix b/pkgs/development/tools/devpod/default.nix
index a09d2a4ee51a..596f252ba02c 100644
--- a/pkgs/development/tools/devpod/default.nix
+++ b/pkgs/development/tools/devpod/default.nix
@@ -23,13 +23,13 @@
 
 let
   pname = "devpod";
-  version = "0.5.19";
+  version = "0.5.20";
 
   src = fetchFromGitHub {
     owner = "loft-sh";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-SQac42C6tVFSP5Gx2s6uP4OKW+b+FoT7/+Lo3W178p0=";
+    sha256 = "sha256-8LbqrOKC1als3Xm6ZuU2AySwT0UWjLN2xh+/CvioYew=";
   };
 
   meta = with lib; {

From 2608b3990cc7280eccff2be50d9fab9a05d4d8bb Mon Sep 17 00:00:00 2001
From: eymeric <eymericdechelette@gmail.com>
Date: Sat, 20 Jul 2024 16:28:41 +0200
Subject: [PATCH 37/93] onlyoffice-documentserver: enable aarch64-linux support

---
 .../onlyoffice-documentserver/default.nix        | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/onlyoffice-documentserver/default.nix b/pkgs/servers/onlyoffice-documentserver/default.nix
index 8cc68f6e502d..e494344d72cd 100644
--- a/pkgs/servers/onlyoffice-documentserver/default.nix
+++ b/pkgs/servers/onlyoffice-documentserver/default.nix
@@ -17,10 +17,16 @@ let
     pname = "onlyoffice-documentserver";
     version = "8.1.3";
 
-    src = fetchurl {
-      url = "https://github.com/ONLYOFFICE/DocumentServer/releases/download/v${lib.concatStringsSep "." (lib.take 3 (lib.splitVersion version))}/onlyoffice-documentserver_amd64.deb";
-      sha256 = "sha256-jCwcXb97Z9/ZofKLYneJxKAnaZE/Hwvm34GLQu/BoUM=";
-    };
+    src = fetchurl ({
+      "aarch64-linux" = {
+        url = "https://github.com/ONLYOFFICE/DocumentServer/releases/download/v${version}/onlyoffice-documentserver_arm64.deb";
+        sha256 = "sha256-+7hHz1UcnlJNhBAVaYQwK0m2tkgsfbjqY3oa8XU0yxo=";
+      };
+      "x86_64-linux" = {
+        url = "https://github.com/ONLYOFFICE/DocumentServer/releases/download/v${version}/onlyoffice-documentserver_amd64.deb";
+        sha256 = "sha256-jCwcXb97Z9/ZofKLYneJxKAnaZE/Hwvm34GLQu/BoUM=";
+      };
+    }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"));
 
     preferLocalBuild = true;
 
@@ -144,7 +150,7 @@ let
       '';
       homepage = "https://github.com/ONLYOFFICE/DocumentServer";
       license = licenses.agpl3Plus;
-      platforms = [ "x86_64-linux" ];
+      platforms = [ "x86_64-linux" "aarch64-linux" ];
       sourceProvenance = [ sourceTypes.binaryNativeCode ];
       maintainers = with maintainers; [ SuperSandro2000 ];
     };

From 6afd91d69de42349b86e326f358a8686d6219bd4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 15 Sep 2024 21:45:13 +0000
Subject: [PATCH 38/93] aws-encryption-sdk-cli: 4.1.0 -> 4.2.0

---
 pkgs/tools/admin/aws-encryption-sdk-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix b/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix
index c218831b7ae8..5fab6fe34ea4 100644
--- a/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix
+++ b/pkgs/tools/admin/aws-encryption-sdk-cli/default.nix
@@ -25,12 +25,12 @@ in
 
 localPython.pkgs.buildPythonApplication rec {
   pname = "aws-encryption-sdk-cli";
-  version = "4.1.0";
+  version = "4.2.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-OCbt0OkDVfpzUIogbsKzaPAle2L6l6N3cmZoS2hEaSM=";
+    hash = "sha256-gORrscY+Bgmz2FrKdSBd56jP0yuEklytMeA3wr8tTZU=";
   };
 
   build-system = with localPython.pkgs; [

From a92693519fd4da631334ea7eb7029ac74f4c136d Mon Sep 17 00:00:00 2001
From: John Garcia <jgarcia3788@yahoo.co.uk>
Date: Mon, 16 Sep 2024 11:58:56 +0100
Subject: [PATCH 39/93] onedrivegui: 1.1.0rc3 -> 1.1.0

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

diff --git a/pkgs/by-name/on/onedrivegui/package.nix b/pkgs/by-name/on/onedrivegui/package.nix
index 2277cb5248de..76dac0203c20 100644
--- a/pkgs/by-name/on/onedrivegui/package.nix
+++ b/pkgs/by-name/on/onedrivegui/package.nix
@@ -10,7 +10,7 @@
 }:
 
 let
-  version = "1.1.0rc3";
+  version = "1.1.0";
 
   setupPy = writeText "setup.py" ''
     from setuptools import setup

From 761b04f506348243b3c57bfdb77c1cc9705d112a Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Mon, 16 Sep 2024 15:28:58 +0200
Subject: [PATCH 40/93] element-desktop: 1.11.76 -> 1.11.77

https://github.com/element-hq/element-desktop/releases/tag/v1.11.77
---
 .../networking/instant-messengers/element/pin.nix      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/element/pin.nix b/pkgs/applications/networking/instant-messengers/element/pin.nix
index ea86d807aafa..9abdf0f463ff 100644
--- a/pkgs/applications/networking/instant-messengers/element/pin.nix
+++ b/pkgs/applications/networking/instant-messengers/element/pin.nix
@@ -1,9 +1,9 @@
 {
-  "version" = "1.11.76";
+  "version" = "1.11.77";
   "hashes" = {
-    "desktopSrcHash" = "sha256-oG1nzOSXl2vjxvxdVg2o5ssKbAqrYHS4pnLCPJsIBCQ=";
-    "desktopYarnHash" = "0bl78yd7apd5qbsqyhxnwj7lwrjx5820zh22rzgn9jqkcv25jwgw";
-    "webSrcHash" = "sha256-1hmSdefNChRcUnwbxS00NYrEexMyg8FIL0BXdEbwm+s=";
-    "webYarnHash" = "0bnxd7kig2a5scgdsd0yhhmanf7zqi2gd2si6kgnr0v2kc0akc0b";
+    "desktopSrcHash" = "sha256-y7cmTSkNzA4aNY7z9sjgyIquTPVvl+nH7BHUx/2nJ5A=";
+    "desktopYarnHash" = "0fwkdrfhfl6knvx552q2lpp5pd54qbzkm4kx6jvcrdwjk3x4cgqd";
+    "webSrcHash" = "sha256-IeBuLlcorsHZ78P6h5LVCCGHauqzwwm2Lc9B07su86Y=";
+    "webYarnHash" = "0nm70m37kqkb959vi69r8zidsh25nzgn1550yl46pzihzbiqm8nx";
   };
 }

From 5614147535c7a1fe82c985cd986fbfc7e285fdf4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Sep 2024 13:35:51 +0000
Subject: [PATCH 41/93] e1s: 1.0.38 -> 1.0.39

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

diff --git a/pkgs/by-name/e1/e1s/package.nix b/pkgs/by-name/e1/e1s/package.nix
index d6759b57deea..edab9766f4a0 100644
--- a/pkgs/by-name/e1/e1s/package.nix
+++ b/pkgs/by-name/e1/e1s/package.nix
@@ -1,7 +1,7 @@
 { lib, buildGoModule, fetchFromGitHub }:
 let
   pname = "e1s";
-  version = "1.0.38";
+  version = "1.0.39";
 in
 buildGoModule {
   inherit pname version;
@@ -10,10 +10,10 @@ buildGoModule {
     owner = "keidarcy";
     repo = "e1s";
     rev = "refs/tags/v${version}";
-    hash = "sha256-OFnriW+rerVTyonuXe9qilR78Qok6QUYQvTDbsTi5L0=";
+    hash = "sha256-kfG9Nkt5L2YokTLPzPuIAmjCHlZvr3FqZiYLr8bU+K4=";
   };
 
-  vendorHash = "sha256-oQVZ1SNXaXOngZazUVeWLvtZu17XvtIcrx+XC6PvGH0=";
+  vendorHash = "sha256-u6h/sqI0Rqs3ZmVXtMNVuL3h9Cj15+mM+QnIaylzlHI=";
 
   meta = with lib; {
     description = "Easily Manage AWS ECS Resources in Terminal 🐱";

From 05b32d5f737e6f1a6029af7da617eec5be537cfa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Sep 2024 18:34:00 +0000
Subject: [PATCH 42/93] clusterctl: 1.8.2 -> 1.8.3

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

diff --git a/pkgs/applications/networking/cluster/clusterctl/default.nix b/pkgs/applications/networking/cluster/clusterctl/default.nix
index 7774248cd30a..1e9183adbaaa 100644
--- a/pkgs/applications/networking/cluster/clusterctl/default.nix
+++ b/pkgs/applications/networking/cluster/clusterctl/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "clusterctl";
-  version = "1.8.2";
+  version = "1.8.3";
 
   src = fetchFromGitHub {
     owner = "kubernetes-sigs";
     repo = "cluster-api";
     rev = "v${version}";
-    hash = "sha256-7MTl1PzkcvnLZgpGQ+SA29Zb3h0iLMWQcN/FvQflM7s=";
+    hash = "sha256-zvMjfaEq6EOWVqjVOoS2nb1fuGyEljcNVfTpAWUsiL8=";
   };
 
   vendorHash = "sha256-0VVaD1vGIGezgkVCvIhNHmZqVFxFu4UcUUh0wuX2viw=";

From e868bfa5b13f5e0b3f092edc6f54b65039ccf301 Mon Sep 17 00:00:00 2001
From: Raymond Douglas <r@rymnd.org>
Date: Mon, 16 Sep 2024 14:27:42 -0700
Subject: [PATCH 43/93] wstunnel: exclude TLS arguments when `enableHTTPS is`
 false

---
 nixos/modules/services/networking/wstunnel.nix | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/wstunnel.nix b/nixos/modules/services/networking/wstunnel.nix
index c05e00809357..bf56858a190f 100644
--- a/nixos/modules/services/networking/wstunnel.nix
+++ b/nixos/modules/services/networking/wstunnel.nix
@@ -318,10 +318,21 @@ let
               lib.cli.toGNUCommandLineShell { } (
                 lib.recursiveUpdate {
                   restrict-to = map hostPortToString restrictTo;
-                  tls-certificate =
-                    if useACMEHost != null then "${certConfig.directory}/fullchain.pem" else "${tlsCertificate}";
-                  tls-private-key = if useACMEHost != null then "${certConfig.directory}/key.pem" else "${tlsKey}";
                   websocket-ping-frequency-sec = websocketPingInterval;
+                  tls-certificate =
+                    if !enableHTTPS then
+                      null
+                    else if useACMEHost != null then
+                      "${certConfig.directory}/fullchain.pem"
+                    else
+                      "${tlsCertificate}";
+                  tls-private-key =
+                    if !enableHTTPS then
+                      null
+                    else if useACMEHost != null then
+                      "${certConfig.directory}/key.pem"
+                    else
+                      "${tlsKey}";
                 } extraArgs
               )
             } \
@@ -475,6 +486,7 @@ in
 
   meta.maintainers = with lib.maintainers; [
     alyaeanyx
+    raylas
     rvdp
     neverbehave
   ];

From 1efd32512f5774df09c69f96bc5f1ff2de981181 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 16 Sep 2024 21:57:14 +0000
Subject: [PATCH 44/93] python312Packages.pypinyin: 0.52.0 -> 0.53.0

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

diff --git a/pkgs/development/python-modules/pypinyin/default.nix b/pkgs/development/python-modules/pypinyin/default.nix
index e51909faab5b..48f4d8d79811 100644
--- a/pkgs/development/python-modules/pypinyin/default.nix
+++ b/pkgs/development/python-modules/pypinyin/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "pypinyin";
-  version = "0.52.0";
+  version = "0.53.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "mozillazg";
     repo = "python-pinyin";
     rev = "refs/tags/v${version}";
-    hash = "sha256-XoRH9vBO0vJl7DqgGrFLfxGFtiQTpXdZoM4FO3TFWeY=";
+    hash = "sha256-NGW94Labk3vAv4bfq/+ba2lnL/uebg0ODZWEi2yNIjg=";
   };
 
   postPatch = ''

From 645595490438ccaea488a31fda4ca3b27db6b717 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Sep 2024 03:07:13 +0000
Subject: [PATCH 45/93] pritunl-ssh: 1.0.2435.24 -> 1.0.3219.78

---
 pkgs/tools/networking/pritunl-ssh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/pritunl-ssh/default.nix b/pkgs/tools/networking/pritunl-ssh/default.nix
index 06cfc4d1a4ce..4cae94e26ece 100644
--- a/pkgs/tools/networking/pritunl-ssh/default.nix
+++ b/pkgs/tools/networking/pritunl-ssh/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname   = "pritunl-ssh";
-  version = "1.0.2435.24";
+  version = "1.0.3219.78";
 
   src = fetchFromGitHub {
     owner = "pritunl";
     repo = "pritunl-zero-client";
     rev = version;
-    sha256 = "sha256-ElnBNVrC4tQLYXhz2d+NMqKdUVx/hgnW3xJ0USKEfVI=";
+    sha256 = "sha256-ksTfgt1AWs8hgUR9w6aWv5MDXeORgYNWYZgAFUqj++s=";
   };
 
   buildInputs = [ python3 ];

From de3f6ac4b77780ba6fdb5ec29434c7d495edb5a6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Sep 2024 03:09:22 +0000
Subject: [PATCH 46/93] operator-sdk: 1.36.1 -> 1.37.0

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

diff --git a/pkgs/development/tools/operator-sdk/default.nix b/pkgs/development/tools/operator-sdk/default.nix
index a99849a3a3ac..9f21ff46889a 100644
--- a/pkgs/development/tools/operator-sdk/default.nix
+++ b/pkgs/development/tools/operator-sdk/default.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "operator-sdk";
-  version = "1.36.1";
+  version = "1.37.0";
 
   src = fetchFromGitHub {
     owner = "operator-framework";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-ZUWbM2g3l5uesM9QDlRqRo9gFipgaS8YyEbnIyRaMS0=";
+    hash = "sha256-ANG9KpyEO+fpjelYU+HNTkbg2S0vFNyPzPRFjcLoLOI=";
   };
 
-  vendorHash = "sha256-FEoAV3Fhmjhkc7sYfE1QQFmhOZbXps57mBD0fyvQq00=";
+  vendorHash = "sha256-pr3WTUZetps/Gof8lttN2beomiobVPCgX0j9V77g5sI=";
 
   nativeBuildInputs = [
     makeWrapper

From 3ec708aa43e90ef5dea72a445c2acfff2bd59418 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Sep 2024 03:13:32 +0000
Subject: [PATCH 47/93] fedimint: 0.4.1 -> 0.4.2

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

diff --git a/pkgs/by-name/fe/fedimint/package.nix b/pkgs/by-name/fe/fedimint/package.nix
index be8bc1f602e3..0e38132affc4 100644
--- a/pkgs/by-name/fe/fedimint/package.nix
+++ b/pkgs/by-name/fe/fedimint/package.nix
@@ -24,16 +24,16 @@ let
 in
 buildRustPackage rec {
   pname = "fedimint";
-  version = "0.4.1";
+  version = "0.4.2";
 
   src = fetchFromGitHub {
     owner = "fedimint";
     repo = "fedimint";
     rev = "v${version}";
-    hash = "sha256-udQxFfLkAysDtD6P3TsW0xEcENA77l+GaDUSnkIBGXo=";
+    hash = "sha256-ih1ZwH8uItplMJU2/XkQseFlYUsf8/TkX8lGyRl7/KU=";
   };
 
-  cargoHash = "sha256-w1yQOEoumyam4JsDarAQffTs8Ype4VUyGJ0vgJfuHaU=";
+  cargoHash = "sha256-scfgUFuS/b4EFfPuhl6uFlTZi4gyTqtEso2a5jhrxno=";
 
   nativeBuildInputs = [
     protobuf

From afec74011ef4ae9097470cd37064e3d1ce556034 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Sep 2024 04:31:00 +0000
Subject: [PATCH 48/93] sendme: 0.15.0 -> 0.16.0

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

diff --git a/pkgs/by-name/se/sendme/package.nix b/pkgs/by-name/se/sendme/package.nix
index 204b3e1ca1c1..e355dd99f317 100644
--- a/pkgs/by-name/se/sendme/package.nix
+++ b/pkgs/by-name/se/sendme/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "sendme";
-  version = "0.15.0";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "n0-computer";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-wU9NnHqn/lTiPQB51o+CTNA1UWIOa21winiLW9ih7dM=";
+    hash = "sha256-nDYsNaR3NQ6ut6gtHwEoiwhj4B4Bac5+NOOq3H2NCYY=";
   };
 
-  cargoHash = "sha256-y8VnunKmNRMO8VOL6u1FpF3Rec+BD4E1KW9Z2J8/2xs=";
+  cargoHash = "sha256-U2/GUpWtpTX+RCBojh3N6DsWB0gjFkH1mGA+AS+fH+o=";
 
   buildInputs = lib.optionals stdenv.isDarwin (
     with darwin.apple_sdk.frameworks; [

From 69bae456fbcfd9007482be47bbcb7773d80318cf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Sep 2024 05:00:35 +0000
Subject: [PATCH 49/93] python312Packages.homeassistant-stubs: 2024.9.1 ->
 2024.9.2

---
 pkgs/servers/home-assistant/stubs.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix
index ba463e839dc8..67645e0c578b 100644
--- a/pkgs/servers/home-assistant/stubs.nix
+++ b/pkgs/servers/home-assistant/stubs.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "homeassistant-stubs";
-  version = "2024.9.1";
+  version = "2024.9.2";
   pyproject = true;
 
   disabled = python.version != home-assistant.python.version;
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "KapJI";
     repo = "homeassistant-stubs";
     rev = "refs/tags/${version}";
-    hash = "sha256-snYfeMKZhQWJx3hi7cvY9tswmPxmtiPHz4S8IM31DvU=";
+    hash = "sha256-o5bk63yErDOqNlYeGD7nMNuQ2p9rQuRYXlmfIMo8w8k=";
   };
 
   build-system = [

From 671796875985730690078a5467df77db5aad9dd2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Sep 2024 05:01:29 +0000
Subject: [PATCH 50/93] python312Packages.iterative-telemetry: 0.0.8 -> 0.0.9

---
 .../python-modules/iterative-telemetry/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/iterative-telemetry/default.nix b/pkgs/development/python-modules/iterative-telemetry/default.nix
index bc7ad3796450..d65f5003c045 100644
--- a/pkgs/development/python-modules/iterative-telemetry/default.nix
+++ b/pkgs/development/python-modules/iterative-telemetry/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "iterative-telemtry";
-  version = "0.0.8";
+  version = "0.0.9";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "iterative";
     repo = "telemetry-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-jD1AyQTdz/NfTRpvEuTE/gUfgNIhNlnimuCks5ImhwA=";
+    hash = "sha256-bcGniytjlN3JFPeMQYjyIP8Ruty9/dnzp9neclbdsfU=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];

From da98e52bfd0f6a24a260a18ab624bd7a7445fcfd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Sep 2024 05:14:16 +0000
Subject: [PATCH 51/93] unit: 1.32.1 -> 1.33.0

---
 pkgs/servers/http/unit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/unit/default.nix b/pkgs/servers/http/unit/default.nix
index 31f4b8bec100..e5a40d2aaea3 100644
--- a/pkgs/servers/http/unit/default.nix
+++ b/pkgs/servers/http/unit/default.nix
@@ -27,14 +27,14 @@ let
 
   inherit (lib) optional optionals optionalString;
 in stdenv.mkDerivation rec {
-  version = "1.32.1";
+  version = "1.33.0";
   pname = "unit";
 
   src = fetchFromGitHub {
     owner = "nginx";
     repo = pname;
     rev = version;
-    sha256 = "sha256-YqejETJTbnmXoPsYITJ6hSnd1fIWUc1p5FldYkw2HQI=";
+    sha256 = "sha256-Q3RXhWI9+G7oUnHYtVK6WZ9s7eIkQ+yPmdqbjWyatTE=";
   };
 
   nativeBuildInputs = [ which ];

From 4151c322498abf031d997ba9d2cd20238c240e7f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Sep 2024 05:54:38 +0000
Subject: [PATCH 52/93] quill-log: 7.0.0 -> 7.1.0

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

diff --git a/pkgs/by-name/qu/quill-log/package.nix b/pkgs/by-name/qu/quill-log/package.nix
index b75caea66099..37ceb53ce0f2 100644
--- a/pkgs/by-name/qu/quill-log/package.nix
+++ b/pkgs/by-name/qu/quill-log/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "quill-log";
-  version = "7.0.0";
+  version = "7.1.0";
 
   src = fetchFromGitHub {
     owner = "odygrd";
     repo = "quill";
     rev = "v${version}";
-    hash = "sha256-lNbr8oPyD/IOP+R2QKTYm9eF3jpYBCXeCtK25ibXtnM=";
+    hash = "sha256-O+nCznhyoGq4u6bTPKaFMrRdFsH3uZmGFpFr4yjCq3I=";
   };
 
   nativeBuildInputs = [ cmake ];

From 9a7ae2e2c24dd9378293387de29a5a2ade96f02f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 17 Sep 2024 09:40:30 +0200
Subject: [PATCH 53/93] python312Packages.aiortm: 0.8.27 -> 0.8.29

Diff: https://github.com/MartinHjelmare/aiortm/compare/refs/tags/v0.8.27...v0.8.29

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

diff --git a/pkgs/development/python-modules/aiortm/default.nix b/pkgs/development/python-modules/aiortm/default.nix
index d5c73e9a52d7..404bd12e15b7 100644
--- a/pkgs/development/python-modules/aiortm/default.nix
+++ b/pkgs/development/python-modules/aiortm/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "aiortm";
-  version = "0.8.27";
+  version = "0.8.29";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "MartinHjelmare";
     repo = "aiortm";
     rev = "refs/tags/v${version}";
-    hash = "sha256-87v1A2FlgM4z0jv4Ii9/ZO3DcLYDAFpnlI5r+UVmzzA=";
+    hash = "sha256-mhtU+M4kjKdvmNFr0+HoZjDj1Hf2qYk3nPOWtdPRP/0=";
   };
 
   postPatch = ''

From e2d725921f64f44e35e244db6a0efcfc9b54199a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 17 Sep 2024 09:41:59 +0200
Subject: [PATCH 54/93] python312Packages.dissect: 3.16 -> 3.16.1

Diff: https://github.com/fox-it/dissect/compare/refs/tags/3.16...3.16.1

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

diff --git a/pkgs/development/python-modules/dissect/default.nix b/pkgs/development/python-modules/dissect/default.nix
index 621d3d6459b5..3873a87d5309 100644
--- a/pkgs/development/python-modules/dissect/default.nix
+++ b/pkgs/development/python-modules/dissect/default.nix
@@ -35,7 +35,7 @@
 
 buildPythonPackage rec {
   pname = "dissect";
-  version = "3.16";
+  version = "3.16.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -44,7 +44,7 @@ buildPythonPackage rec {
     owner = "fox-it";
     repo = "dissect";
     rev = "refs/tags/${version}";
-    hash = "sha256-Nj9PPhjj1kNNrZ1Lqt60O26z80HPD63EB1gKZ1ZiSeY=";
+    hash = "sha256-OpTznjOVV3hyreJv4WCHwP09ULMTz+vjjcmBtYL685E=";
   };
 
   pythonRelaxDeps = true;

From a0d887a76d21a3bb3f8cabe5a52c5bd5cb46d3d1 Mon Sep 17 00:00:00 2001
From: Arseniy Zorin <me@wrbbz.com>
Date: Tue, 17 Sep 2024 10:46:26 +0300
Subject: [PATCH 55/93] pulumi-bin: 3.132.0 -> 3.133.0

---
 pkgs/tools/admin/pulumi-bin/data.nix | 194 +++++++++++++--------------
 1 file changed, 97 insertions(+), 97 deletions(-)

diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix
index a737d652bce4..b9ee4437d430 100644
--- a/pkgs/tools/admin/pulumi-bin/data.nix
+++ b/pkgs/tools/admin/pulumi-bin/data.nix
@@ -1,12 +1,12 @@
 # DO NOT EDIT! This file is generated automatically by update.sh
 { }:
 {
-  version = "3.132.0";
+  version = "3.133.0";
   pulumiPkgs = {
     x86_64-linux = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.132.0-linux-x64.tar.gz";
-        sha256 = "1ylraqx71fc28aij6hpmqgq83ccs1615222ccav3q2r3k72jjw8h";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.133.0-linux-x64.tar.gz";
+        sha256 = "0yxlgy48i3b80f8y8nbgvq93i1qcz43ya2la6z5wfhj4cxc900rc";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.23.1-linux-amd64.tar.gz";
@@ -17,20 +17,20 @@
         sha256 = "1ckk20g77lwgg5v4baai0w6cvw9zapf31jy42lm9l3qnzx61fm6r";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.62.0-linux-amd64.tar.gz";
-        sha256 = "17mhp43q3igid15qavhib3ffcgz5ll64nxs9iv1gasmlm6v4gand";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.62.1-linux-amd64.tar.gz";
+        sha256 = "1pq2xl59ady3id356gxp08ml7jdlzk4hm0rlq6dk9cn7v9nvj973";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.9.0-linux-amd64.tar.gz";
-        sha256 = "0k520iz4rf26x09nhy3xzxky6ni6c6q26l4pks8zylm508g8kkaz";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.9.1-linux-amd64.tar.gz";
+        sha256 = "0pv5cl6wvgwvz17r2q4i4d0bmkxyvqn3yhid91bvxx1n11i0rb2y";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.7.1-linux-amd64.tar.gz";
         sha256 = "0qfkbwbkgh828hxgr64z8mkf6hbpqzwdfc2q6b1r718g647cm7nb";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.51.1-linux-amd64.tar.gz";
-        sha256 = "1qvyh1d70lrgxbdkmcjcgl5pldc9a4bnzii9p3nnhgs37ks95w31";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.52.0-linux-amd64.tar.gz";
+        sha256 = "17ghj412xh4d80ih2lbl43xlaj97ia89jfkj2z6mxv1k5b4mmsc6";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.3-linux-amd64.tar.gz";
@@ -57,8 +57,8 @@
         sha256 = "06smn9a3lrmqz9k2akzg984345h22mnlv75x6y3yzgs7cihyq26m";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.31.1-linux-amd64.tar.gz";
-        sha256 = "1fy4cykm8ad2933zgf085xdbbd3ifyf9hrf0dnb5j8yn27g4svn7";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.32.0-linux-amd64.tar.gz";
+        sha256 = "1kn7082ni26di624jpsnm99rhshg22x756795qlkl81frpmn40i1";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.5-linux-amd64.tar.gz";
@@ -69,16 +69,16 @@
         sha256 = "0hnardid0kbzy65dmn7vz8ddy5hq78nf2871zz6srf2hfyiv7qa4";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.11.0-linux-amd64.tar.gz";
-        sha256 = "1qjcw8hrn9q3k4dzfhbjychzvv3cklf33daq60rsfk62qny5rdva";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.11.1-linux-amd64.tar.gz";
+        sha256 = "0k4phk9p7w58lnl65d21r6182gw1pawz8zj21dycbsbyx68vbqfc";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.38.0-linux-amd64.tar.gz";
-        sha256 = "1knjxddn118zzcmn3srgq5a7qfxd49zdqg9ki4w6gg5qnpisdk0s";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.1.0-linux-amd64.tar.gz";
+        sha256 = "1rq8njkjzajwjbj7kgm1n12fblyvxj4ar04cb883si0d48015l1p";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.5-linux-amd64.tar.gz";
-        sha256 = "11d0fmh3r0j4zh4ps192zvbwpsln5alpra9nkxrfk8ksp8kvhcp7";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.3.0-linux-amd64.tar.gz";
+        sha256 = "1qn8x8k4gn5qr9h5r5a1pj2x9fvpn3ass9g4xdqcdfrvi8x1xn3v";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.3.1-linux-amd64.tar.gz";
@@ -93,12 +93,12 @@
         sha256 = "1cr2rwv1k4myd4gdyb88v4vyqrlxkl2br4jrvnari7sklpb4kjz9";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.0-linux-amd64.tar.gz";
-        sha256 = "0h0dmb5q2flkjgkv7ps9maildc9cfcd921n38wyccql9nscrdy94";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.1-linux-amd64.tar.gz";
+        sha256 = "1c19ylgpigrcflaklyk5dd0qg2b5zpn0gn5nm9brxy5za2k60n3f";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.26.0-linux-amd64.tar.gz";
-        sha256 = "1y5a624zkig2n3hsdyrjb535npr8hcfxj6rifijk6m9zf4nywjni";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.27.0-linux-amd64.tar.gz";
+        sha256 = "0paqwfdqjdd5cymrjfmx8qq8j26hgcjmy2zlgjp516psfvf645vp";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.5-linux-amd64.tar.gz";
@@ -133,8 +133,8 @@
         sha256 = "10d34620hkdqmflb24gs8hapf5apb45ribw695xz9pdwkhqrd3wp";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.16.2-linux-amd64.tar.gz";
-        sha256 = "03y02rcy2xarvb4v33wxqf2qcy71amc9f6j6h406c8w8dnlaa9c3";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.0-linux-amd64.tar.gz";
+        sha256 = "13imgiw2lys6d4wdriqrzmgsszkkam8lg7c01nz6xcqr2lccf2xy";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.6-linux-amd64.tar.gz";
@@ -145,8 +145,8 @@
         sha256 = "0dmx29ldms7mwhi4ka9qnz53qkis29diyz4g06hbnkc6j1bdc7jn";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.1-linux-amd64.tar.gz";
-        sha256 = "11g44ngbz4yar22flz6l1qxsjrjh1ks0fihln0g2b2da9n24v251";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.2-linux-amd64.tar.gz";
+        sha256 = "07izmvi0z326vbjc7nnq8q4imxz3ljdaanmbxk8imdhg6ikfbfxd";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.11.1-linux-amd64.tar.gz";
@@ -163,8 +163,8 @@
     ];
     x86_64-darwin = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.132.0-darwin-x64.tar.gz";
-        sha256 = "0xcrv8536h043s0sk3h5ja75xjvcpx4adqhdn799sjlbx449mv1i";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.133.0-darwin-x64.tar.gz";
+        sha256 = "1823lpgdn3q98nls7d967hfqsddkaawldcqcwiqw809qsr7786hq";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.23.1-darwin-amd64.tar.gz";
@@ -175,20 +175,20 @@
         sha256 = "0l34kaa1x2sbalx0dannmmysr1ai8bh2z6x0lzg1iwxhr6fdvl3a";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.62.0-darwin-amd64.tar.gz";
-        sha256 = "0mzygnyznqjj7niz7dv4c936riqbqrw4291ws76f777awksyri2c";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.62.1-darwin-amd64.tar.gz";
+        sha256 = "10xngdq0rcmpfl4mfkarvf14fiba43pb7fkdcs13mijqym4gay90";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.9.0-darwin-amd64.tar.gz";
-        sha256 = "06qg7jm9gr5s2nh1c44h94s17ai165c24j1lig01m27gwvdddl0z";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.9.1-darwin-amd64.tar.gz";
+        sha256 = "1nw8g4svrm2x26nxndfhk5rj0jjdjz02s6rgkvy364l517xfd84k";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.7.1-darwin-amd64.tar.gz";
         sha256 = "1hqcr1yhlc8m99w8z0i3mr3wnvnldkbwni4v5s1r11blpzqrwa0p";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.51.1-darwin-amd64.tar.gz";
-        sha256 = "1cvf7y3xgplyd7j586fa10j9s9wm7h6nqdvhydkbqzlrbqs6ys6p";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.52.0-darwin-amd64.tar.gz";
+        sha256 = "1m52yb52cgz10vww4cfwqs6db2jy4i9zmfc1b1pq64bnlr1y8a5j";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.3-darwin-amd64.tar.gz";
@@ -215,8 +215,8 @@
         sha256 = "0hdnyy6fjnrz0shqf0jsyl80w5r3pmkbpgyv41s37n6yk04kmcgy";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.31.1-darwin-amd64.tar.gz";
-        sha256 = "1wvzw476njjpa2k9rb8wsgng6xv3fc626zmc2zw318502y0r5h95";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.32.0-darwin-amd64.tar.gz";
+        sha256 = "0irvmlj7xl5ydf01f1k3b6aiankj4pf0aq1mq0qkvsnr3lg7fbfz";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.5-darwin-amd64.tar.gz";
@@ -227,16 +227,16 @@
         sha256 = "1m5lh59h7nck1flzxs9m4n0ag0klk3jmnpf7hc509vffxs89xnjq";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.11.0-darwin-amd64.tar.gz";
-        sha256 = "0c77zq6dkcbwx41yg3ziknzgf4snb1xfy1q2hz3668virjwkxsli";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.11.1-darwin-amd64.tar.gz";
+        sha256 = "0wf6vwa9dj7k18p3rmfmxw07vag5jqf5d9fdb467ijnvha463lan";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.38.0-darwin-amd64.tar.gz";
-        sha256 = "1gf871rl8kzxmfmmcnm6rzjx03gcv0w208jd80v8b5ic9k0wrxq9";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.1.0-darwin-amd64.tar.gz";
+        sha256 = "03mkrnkqgqyy1d2mharbbd37kg98yd8jxl55rymcgdk12a515ayn";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.5-darwin-amd64.tar.gz";
-        sha256 = "14mmh98wjlpkqdkcsqc58hixf2gkdlvqzjj6cx2gg1h8cyg6qnqj";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.3.0-darwin-amd64.tar.gz";
+        sha256 = "162y9zyjwqzhh9ahph8vn9zmca8xc123hrybmhlhn6srj5sqjldh";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.3.1-darwin-amd64.tar.gz";
@@ -251,12 +251,12 @@
         sha256 = "0lkbzgp8kycnd2285zb90w6l0q5iigmjamxh4zrak86vrk4lnyz7";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.0-darwin-amd64.tar.gz";
-        sha256 = "047y788pxxlls03j9anp9a7mngq9rkr1x5cyq0gjch11605p0fay";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.1-darwin-amd64.tar.gz";
+        sha256 = "0hjmvd26a0fpsbzkyhafmj92jjr26lz1yr93gn2idhnzn9vg2d95";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.26.0-darwin-amd64.tar.gz";
-        sha256 = "1qdmzw9pnjc7inpfcqcsn4426dhwrl5x06bcnw9mcjkigli0cr22";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.27.0-darwin-amd64.tar.gz";
+        sha256 = "03q47z5kprj6adsk7fshc7jclah6rwcw3jzlvkvy2hbr6li43364";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.5-darwin-amd64.tar.gz";
@@ -291,8 +291,8 @@
         sha256 = "0791x9j63kq8cbh2gmgsmbaim6067df3i164kiwpm4y1l38f8yf6";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.16.2-darwin-amd64.tar.gz";
-        sha256 = "0sr9a8zgfvhyr9993pmfddiw92c2m6v5wiafpd0p5hfzf99n5l8c";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.0-darwin-amd64.tar.gz";
+        sha256 = "0vbqwwqrx6s87m8ikngbhqwi207p6hs6ckapq9bivhjr2hl0vc8f";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.6-darwin-amd64.tar.gz";
@@ -303,8 +303,8 @@
         sha256 = "00l1ybf0a2bjkvd10db9ilyxq0zpv55r3wdy7s9dklq2bagmqzjz";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.1-darwin-amd64.tar.gz";
-        sha256 = "1g164xrj9nkdjw9pw08y24vzhg25f8h5702rfjsk0s2z011g86p7";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.2-darwin-amd64.tar.gz";
+        sha256 = "1ps4dywj60k5y8cri6g2vgrssaipmm9z8hp3mi9qnifr9vbwgd30";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.11.1-darwin-amd64.tar.gz";
@@ -321,8 +321,8 @@
     ];
     aarch64-linux = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.132.0-linux-arm64.tar.gz";
-        sha256 = "1ny1wsjw6zickc1lc8cm223zngdlag5zdrxm7q5vpqxmw6lxkvhy";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.133.0-linux-arm64.tar.gz";
+        sha256 = "1fn37w2ad5bla6lpzvk2f8rbm9wcpfmf6nrdgbwm3lfyml0sijcq";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.23.1-linux-arm64.tar.gz";
@@ -333,20 +333,20 @@
         sha256 = "1ldlxsnpjkdqh2xdfl56wgq9y94vaigc5i3q6cz682094fwhmw42";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.62.0-linux-arm64.tar.gz";
-        sha256 = "1l5947vz9k5p6n9ij072igb1ck52fm0rxim82aa0bhvbg794l08a";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.62.1-linux-arm64.tar.gz";
+        sha256 = "0xsyvl8x6qi21g71ys2d71fnhkmy8yxix12fvb21kk03b412rhcf";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.9.0-linux-arm64.tar.gz";
-        sha256 = "0bcxkk2rl9bls4h7nn0s1hm4lnypz30w4vgkc5wphw6a8jr55pr5";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.9.1-linux-arm64.tar.gz";
+        sha256 = "1wwmbg6zi5w6625pjmpbqvlw8kjj02vd1fxldl56hdwq8l0qlc71";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.7.1-linux-arm64.tar.gz";
         sha256 = "0h7ngd0zblvgf22m563p7f2y3kpqlvn5kqvb6psz3ixa8k4klmz7";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.51.1-linux-arm64.tar.gz";
-        sha256 = "0k5n9kcbs2h86d89lrcmcliihb0avxya765z8gzxj97mgyfz0x8j";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.52.0-linux-arm64.tar.gz";
+        sha256 = "07qkkic0p6na4phg69sd3n919x4s5y35i0j15r93fww5r5y25ic2";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.3-linux-arm64.tar.gz";
@@ -373,8 +373,8 @@
         sha256 = "070jixfr3qqzk4ni24fzankqmvmvn27cixipa8xfmxg4wwci8kb3";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.31.1-linux-arm64.tar.gz";
-        sha256 = "0m02qhcfddwkxpyvhn7m8gs3g7wbn6hv47ywkjifxs4wxq11b0vn";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.32.0-linux-arm64.tar.gz";
+        sha256 = "0gj68p1rxxp8bqz7s03dpxiw4mwnbm5v6zlnsmm395wxd98fin9l";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.5-linux-arm64.tar.gz";
@@ -385,16 +385,16 @@
         sha256 = "111pia2f5xwkwaqs6p90ri29l5b3ivmahsa1bji4fwyyjyp22h4r";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.11.0-linux-arm64.tar.gz";
-        sha256 = "1rpcrwvs7c9h5g02j0lp8wfqxk2n2cizaa79l7vpnl1n2rm5fp37";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.11.1-linux-arm64.tar.gz";
+        sha256 = "0gafajkj6zskxghjsbskyqlnyy70y7z22vkihn00h7lh0i71q97g";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.38.0-linux-arm64.tar.gz";
-        sha256 = "0rcj1lc5d65m36q712a4ic87443cpb5fvk04wqcnmicybgrfyhnl";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.1.0-linux-arm64.tar.gz";
+        sha256 = "1wjpp49xwhz45xwim67hfgbifvxr29mghv7zvxss24lfyps3f9k4";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.5-linux-arm64.tar.gz";
-        sha256 = "0kyalnvdvr8s7fpikrpngwjnajbvvsii9dw30wky1gcl0584zggn";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.3.0-linux-arm64.tar.gz";
+        sha256 = "14jsk2s02idmfi8m832l62gx34g466zvw78z3g9pabnn4igr9ixz";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.3.1-linux-arm64.tar.gz";
@@ -409,12 +409,12 @@
         sha256 = "00ip2mi0hizfcvrmhq609ppghxpw50nihq0gaxl6lw9a7983ai97";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.0-linux-arm64.tar.gz";
-        sha256 = "04xvc3f94hybbdsln067qjw32876vak6msifqmh9vw3jkrzz60nx";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.1-linux-arm64.tar.gz";
+        sha256 = "04vxicmfwi72irkl5rp3jvj4qpxxz49z5fhgnfirhj5kksb6cggz";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.26.0-linux-arm64.tar.gz";
-        sha256 = "0yibsz34larfka6m4lxbsgk9kwcai8x904aqhwfl9hhl54wklyhn";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.27.0-linux-arm64.tar.gz";
+        sha256 = "1xxg7d3rzp6gd56qd3zggyq6yjq460iipz9c28s3r34p4s1mr4sx";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.5-linux-arm64.tar.gz";
@@ -449,8 +449,8 @@
         sha256 = "14hsny87inyvays04khhan9kg0a0kfi2x085yrqs6cy8pnshx29w";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.16.2-linux-arm64.tar.gz";
-        sha256 = "08f5yqxf0vgidcmwrzq8scdbd2h4wdz226l87h8rxpzssj56lpls";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.0-linux-arm64.tar.gz";
+        sha256 = "1qbqqg8dhc3hs1rmf0gwzvys0izqbmfwhjr85qbydar5ydwapwx8";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.6-linux-arm64.tar.gz";
@@ -461,8 +461,8 @@
         sha256 = "16j5vimwjksnjwfmgf8nkmja5g8pqi9hsw0mr8xndl61hsrawirn";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.1-linux-arm64.tar.gz";
-        sha256 = "0jkjbsdmsc50jwv9rr40s0hlhwyhljwz95s5ll28xmmk413jkpfr";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.2-linux-arm64.tar.gz";
+        sha256 = "11rcd6whkn8d21h1y37h15ih4wpdjmbyp2kf8x4150wq8s7cxgrc";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.11.1-linux-arm64.tar.gz";
@@ -479,8 +479,8 @@
     ];
     aarch64-darwin = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.132.0-darwin-arm64.tar.gz";
-        sha256 = "0wkmc2kajcd35js6ircf5an7h3hq7ra8z154v47dyid39m7c5bc5";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.133.0-darwin-arm64.tar.gz";
+        sha256 = "1y8jm0vi1f0rjmj2vx345a64szx752nj80kn8nxsk4k48ywx0ggi";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.23.1-darwin-arm64.tar.gz";
@@ -491,20 +491,20 @@
         sha256 = "0nwb4w5y5nyz8a9marqln338mhxgj49iw2br5p7rksfw0xcv3a4x";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.62.0-darwin-arm64.tar.gz";
-        sha256 = "125ck3a48ailqb7qwvfk7mx321k71xg3wby4fcvb2wjqgyl0x1kl";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.62.1-darwin-arm64.tar.gz";
+        sha256 = "108qc3nm58sp43b39xzg1nz6vglpcyyjvqxy489pj42grk0w1lw4";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.9.0-darwin-arm64.tar.gz";
-        sha256 = "174dzisax2mqjm6gwmq20va0yivz3jqkczq03ys8b4m7q4s9yl7w";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v7.9.1-darwin-arm64.tar.gz";
+        sha256 = "0sfwvz38202fxk6qvai7jnd3bq183cvhsh1kgw4a88anaqis640k";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.7.1-darwin-arm64.tar.gz";
         sha256 = "1d6gpymsa5qjn03510pz61g774qh53v914hg2dm5kqrjzgb1mnvh";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.51.1-darwin-arm64.tar.gz";
-        sha256 = "0321gnpljbzwyn1cdw5y3rhwi6kipavqnyamq6pa2s3725pplbys";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v6.52.0-darwin-arm64.tar.gz";
+        sha256 = "13d33lvlhka2900acq7aksqnyvcyfhcb9cazj4dllrs71kj1smx3";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.53.3-darwin-arm64.tar.gz";
@@ -531,8 +531,8 @@
         sha256 = "0p2vciicmq7103cg205pqsxpjz0p0k1a1dbiakr2qjx56crraj4b";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.31.1-darwin-arm64.tar.gz";
-        sha256 = "0b09fpif0ild5lf9fvp2r6ivk0n5c14whc70d7v6v7xab1pfi0pj";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.32.0-darwin-arm64.tar.gz";
+        sha256 = "1vgx0myp2h42isqiq5aa1vca37y8cyx55sai9s8i4i6i8cjqqx72";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.5.5-darwin-arm64.tar.gz";
@@ -543,16 +543,16 @@
         sha256 = "12bzicm43l7yvh02v5fx3z8v46l9i7a9f677735xi5rjbmd2an4c";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.11.0-darwin-arm64.tar.gz";
-        sha256 = "0qdy46n9zh1l0cqa8jyd7z8hvksp6ylfp3rix6l9kq6lhd8iiggs";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v8.11.1-darwin-arm64.tar.gz";
+        sha256 = "1pm7vggaqsb8yrpk2swzpn6bm9jsqddf7cmx26sw0vd73shhmkd0";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v7.38.0-darwin-arm64.tar.gz";
-        sha256 = "1i8cwbq01fdrlsx2r14q6f06ysq9gyb8c5ak377aihj8p3rkz224";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v8.1.0-darwin-arm64.tar.gz";
+        sha256 = "1bgh5bym2f2l1s0pvvvs5fpf1qcvdvsnxf8d81346cfnk7qjw5jx";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.2.5-darwin-arm64.tar.gz";
-        sha256 = "0s5f8zsiqzc1bnf31c8m2alq62i5sbk6plkm58aahmsw28vky3li";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.3.0-darwin-arm64.tar.gz";
+        sha256 = "0jmdqpajx5c1nnc01qwyjp8gil71wp3k2ddj7ac2vh4m75341ki9";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v8.3.1-darwin-arm64.tar.gz";
@@ -567,12 +567,12 @@
         sha256 = "19shjz66ybjkcij72bhknsnxgpg8acnv6vp1lkmxd39s5g87ajv0";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.0-darwin-arm64.tar.gz";
-        sha256 = "1vqyd9g11k64wqmp5c0si7xycl1wlfl694fg6l8jv6dhkmr44q5b";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.18.1-darwin-arm64.tar.gz";
+        sha256 = "1gndidz869h2i6ig47a42nvqvzhsj8zzq9qlmb9z87gn2hxqfg69";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.26.0-darwin-arm64.tar.gz";
-        sha256 = "00x5jxb3adjym0qkamwz962r533c9zq4x6ijhhcsjv393326l8am";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v4.27.0-darwin-arm64.tar.gz";
+        sha256 = "194h7v4wrpmqk3494n75yn9y042ayg5xffghixqgq3h6pf1d2y9g";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.5-darwin-arm64.tar.gz";
@@ -607,8 +607,8 @@
         sha256 = "0ij18wxlhy84hwjwh0h0yf0jl3zpky66a15v6y0gh9w9sn5ng47f";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.16.2-darwin-arm64.tar.gz";
-        sha256 = "0d7jyzf66hxg13zkg9c4g63328vazlp9g7z9djqx44zmpxm6yh2b";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tailscale-v0.17.0-darwin-arm64.tar.gz";
+        sha256 = "1vpbar4a93fn6kbms0nahqgj256x97cvn9kyv48v8hs4cxa7n0qr";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-tls-v5.0.6-darwin-arm64.tar.gz";
@@ -619,8 +619,8 @@
         sha256 = "15djjgjf117hswmg8pg53xp8ck8wp2lls6vnfj6ppdx5c6mpj0gh";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.1-darwin-arm64.tar.gz";
-        sha256 = "114cbaxhr067nf6rhxqnxhqzfwbq6sak6wmxjq5d25xxx0k0392j";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.10.2-darwin-arm64.tar.gz";
+        sha256 = "103jidsyp9px082yg00cf57jps1iz96cjy7p9a5hrwvjf17m75mz";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.11.1-darwin-arm64.tar.gz";

From 7f476a9e7c90bbf3ffa7735331b9e242d9d15db2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 17 Sep 2024 09:55:32 +0200
Subject: [PATCH 56/93] firefly: init at 1.4.3

Black box fuzzer for web applications

https://github.com/Brum3ns/firefly
---
 pkgs/by-name/fi/firefly/package.nix | 39 +++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 pkgs/by-name/fi/firefly/package.nix

diff --git a/pkgs/by-name/fi/firefly/package.nix b/pkgs/by-name/fi/firefly/package.nix
new file mode 100644
index 000000000000..631627c3dd57
--- /dev/null
+++ b/pkgs/by-name/fi/firefly/package.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule rec {
+  pname = "firefly";
+  version = "1.4.3";
+
+  src = fetchFromGitHub {
+    owner = "Brum3ns";
+    repo = "firefly";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-hhZw7u4NX+BvapUZv0k2Xu/UOdL7Pt8Idjat4aJzvIk=";
+  };
+
+  vendorHash = "sha256-eeVj0nU+cs1cZNVvwu4LgtQkpddtyYAYS91ANHyOjcY=";
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  preCheck = ''
+    # Test fails with invalid memory address or nil pointer dereference
+    substituteInPlace tests/httpfilter_test.go \
+      --replace-fail "Test_HttpFilter" "Skip_HttpFilter"
+  '';
+
+  meta = {
+    description = "Black box fuzzer for web applications";
+    homepage = "https://github.com/Brum3ns/firefly";
+    # https://github.com/Brum3ns/firefly/issues/12
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ fab ];
+    mainProgram = "firefly";
+  };
+}

From ed889141a3da9e2bda5a9b7807b84497b7b328cf Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 17 Sep 2024 10:06:40 +0200
Subject: [PATCH 57/93] tartufo: init at 5.0.1

Tool to search through git repositories for high entropy strings and secrets

https://github.com/godaddy/tartufo
---
 pkgs/by-name/ta/tartufo/package.nix | 42 +++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 pkgs/by-name/ta/tartufo/package.nix

diff --git a/pkgs/by-name/ta/tartufo/package.nix b/pkgs/by-name/ta/tartufo/package.nix
new file mode 100644
index 000000000000..1ee23cf2516c
--- /dev/null
+++ b/pkgs/by-name/ta/tartufo/package.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  python3,
+  fetchFromGitHub,
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "tartufo";
+  version = "5.0.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "godaddy";
+    repo = "tartufo";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-mwwenmSCxnzD2DLf1a/dsQjwJ2GetMgRGj/noqWJ/E0=";
+  };
+
+  pythonRelaxDeps = [ "tomlkit" ];
+
+  build-system = with python3.pkgs; [ poetry-core ];
+
+  dependencies = with python3.pkgs; [
+    cached-property
+    click
+    colorama
+    gitpython
+    pygit2
+    tomlkit
+  ];
+
+  pythonImportsCheck = [ "tartufo" ];
+
+  meta = {
+    description = "Tool to search through git repositories for high entropy strings and secrets";
+    homepage = "https://github.com/godaddy/tartufo";
+    changelog = "https://github.com/godaddy/tartufo/blob/${src.rev}/CHANGELOG.md";
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ fab ];
+    mainProgram = "tartufo";
+  };
+}

From 0a377d964e87968d18df4c71c5c3afd78fbdbb8c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 17 Sep 2024 10:09:57 +0200
Subject: [PATCH 58/93] python312Packages.iterative-telemetry: refactor

---
 .../python-modules/iterative-telemetry/default.nix          | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/iterative-telemetry/default.nix b/pkgs/development/python-modules/iterative-telemetry/default.nix
index d65f5003c045..a3c57d4e0798 100644
--- a/pkgs/development/python-modules/iterative-telemetry/default.nix
+++ b/pkgs/development/python-modules/iterative-telemetry/default.nix
@@ -15,7 +15,7 @@
 buildPythonPackage rec {
   pname = "iterative-telemtry";
   version = "0.0.9";
-  format = "pyproject";
+  pyproject = true;
 
   disabled = pythonOlder "3.8";
 
@@ -26,9 +26,9 @@ buildPythonPackage rec {
     hash = "sha256-bcGniytjlN3JFPeMQYjyIP8Ruty9/dnzp9neclbdsfU=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
+  build-system = [ setuptools-scm ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     requests
     appdirs
     filelock

From 86ba0b8c1aef55d4d3214f74682b94d8092dc270 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 17 Sep 2024 10:18:41 +0200
Subject: [PATCH 59/93] python312Packages.identify: 2.6.0 -> 2.6.1

Diff: https://github.com/pre-commit/identify/compare/refs/tags/v2.6.0...v2.6.1
---
 pkgs/development/python-modules/identify/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/identify/default.nix b/pkgs/development/python-modules/identify/default.nix
index 5ffd7c74df52..a04317e4ed9e 100644
--- a/pkgs/development/python-modules/identify/default.nix
+++ b/pkgs/development/python-modules/identify/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "identify";
-  version = "2.6.0";
+  version = "2.6.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "pre-commit";
     repo = "identify";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ZusDe675QdQyiiGSdmWT+l1jGEGXEY+Dobm4y20WWX8=";
+    hash = "sha256-EbJiMTDE9eumhkWTXlcB38rHrX5DPAZdqix2H4ocnkE=";
   };
 
   build-system = [ setuptools ];

From 58dbfcff203c098abd27059adc05e01319ab8a20 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Sep 2024 08:47:45 +0000
Subject: [PATCH 60/93] snac2: 2.58 -> 2.59

---
 pkgs/servers/snac2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/snac2/default.nix b/pkgs/servers/snac2/default.nix
index 5fc20f7892c2..c4e30fa74f66 100644
--- a/pkgs/servers/snac2/default.nix
+++ b/pkgs/servers/snac2/default.nix
@@ -10,14 +10,14 @@
 
 stdenv.mkDerivation rec {
   pname = "snac2";
-  version = "2.58";
+  version = "2.59";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "grunfink";
     repo = pname;
     rev = version;
-    hash = "sha256-+cn3wX8usOW1D0frjeW4fA+Gg6YU975ROXpMi52N4qU=";
+    hash = "sha256-CIn+/LC6z+2lnU8w3EzrBIBg94J9OnCxME2mZW65OwE=";
   };
 
   buildInputs = [ curl openssl ];

From 25f6b54b667193899235de3d474a124f4e3d2547 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Sep 2024 10:01:07 +0000
Subject: [PATCH 61/93] moon: 1.28.0 -> 1.28.2

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

diff --git a/pkgs/development/tools/build-managers/moon/default.nix b/pkgs/development/tools/build-managers/moon/default.nix
index d7ef98efd87b..adb3c306a779 100644
--- a/pkgs/development/tools/build-managers/moon/default.nix
+++ b/pkgs/development/tools/build-managers/moon/default.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "moon";
-  version = "1.28.0";
+  version = "1.28.2";
 
   src = fetchFromGitHub {
     owner = "moonrepo";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-RqL7C+0AZ9iqJ8j09ToGE7gWItMM0c2qf99yh4SPQj4=";
+    hash = "sha256-T+fPQ9qQ3mdnf80E6L7VYtDQpiGNj209yH+IgmdAgug=";
   };
 
-  cargoHash = "sha256-1chIr0cAUrXR4cfzSBq0omKcizHb8nL6lcdeNaRKGdU=";
+  cargoHash = "sha256-PgeVoq0jS7i6WD0cZRHu86zWgxK8fRpJhHujsaFqRy0=";
 
   env = {
     RUSTFLAGS = "-C strip=symbols";

From c58c2843aea42fd83fad3f895c98796b87810ddb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Sep 2024 10:14:34 +0000
Subject: [PATCH 62/93] cargo-mobile2: 0.17.0 -> 0.17.2

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

diff --git a/pkgs/development/tools/rust/cargo-mobile2/default.nix b/pkgs/development/tools/rust/cargo-mobile2/default.nix
index 6eaddff17c75..28c94f9a0f02 100644
--- a/pkgs/development/tools/rust/cargo-mobile2/default.nix
+++ b/pkgs/development/tools/rust/cargo-mobile2/default.nix
@@ -12,7 +12,7 @@
 let
   inherit (darwin.apple_sdk.frameworks) CoreServices;
   pname = "cargo-mobile2";
-  version = "0.17.0";
+  version = "0.17.2";
 in
 rustPlatform.buildRustPackage {
   inherit pname version;
@@ -20,14 +20,14 @@ rustPlatform.buildRustPackage {
     owner = "tauri-apps";
     repo = pname;
     rev = "cargo-mobile2-v${version}";
-    hash = "sha256-w+3AqfdzbPKuRa81Q4WhQyc32xzY2IhhG2ylVmwAHkA=";
+    hash = "sha256-No2xlLRSNvjgW5WtQ8u3Wev/+RyamsJ2f6p4ONKeRe0=";
   };
 
   # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at
   # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202
   # sourceRoot = "${src.name}/tooling/cli";
 
-  cargoHash = "sha256-q7cuN2ZNcMfsrn1LS4ZqlJZr1vyCKT07Ksup0L2V0o0=";
+  cargoHash = "sha256-oc3Hc0mWuL9bd1SgyJD9nK9kuPLZEaWFbydL/ti09HU=";
 
   preBuild = ''
     mkdir -p $out/share/

From ecd57460373ae808f62cb003c11d5213142d4a2a Mon Sep 17 00:00:00 2001
From: Matthew Brown <matt@ederoyd.co.uk>
Date: Tue, 17 Sep 2024 11:20:57 +0100
Subject: [PATCH 63/93] cargo-lambda: 1.3.0 -> 1.4.0

---
 .../tools/rust/cargo-lambda/default.nix       | 54 ++++++++++++-------
 1 file changed, 34 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-lambda/default.nix b/pkgs/development/tools/rust/cargo-lambda/default.nix
index 31bc188f5883..75127127eae2 100644
--- a/pkgs/development/tools/rust/cargo-lambda/default.nix
+++ b/pkgs/development/tools/rust/cargo-lambda/default.nix
@@ -1,36 +1,46 @@
-{ lib
-, cacert
-, curl
-, rustPlatform
-, fetchFromGitHub
-, makeWrapper
-, pkg-config
-, openssl
-, stdenv
-, CoreServices
-, Security
-, zig
-, nix-update-script
+{
+  lib,
+  cacert,
+  curl,
+  rustPlatform,
+  fetchFromGitHub,
+  makeWrapper,
+  pkg-config,
+  openssl,
+  stdenv,
+  CoreServices,
+  Security,
+  zig,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-lambda";
-  version = "1.3.0";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-6259HRTMQZWQ8wDcsExvUVzl9IaChsMmB6zaVAeSSAM=";
+    hash = "sha256-QTFIFD04pAcNgj+ktY8WP0ScDmSy6mNlhfiXAabMlGE=";
   };
 
-  cargoHash = "sha256-fMQFifEnEsDU99vWifPWgHpGGZae84xez3m01MLK7Mo=";
+  cargoHash = "sha256-1/+bkxEpIvaJBJatqpX186MHKOdLO8Jiw8NEnyr9ctg=";
 
-  nativeCheckInputs = [cacert];
+  nativeCheckInputs = [ cacert ];
 
-  nativeBuildInputs = [ makeWrapper pkg-config ];
+  nativeBuildInputs = [
+    makeWrapper
+    pkg-config
+  ];
 
-  buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl CoreServices Security ];
+  buildInputs =
+    [ openssl ]
+    ++ lib.optionals stdenv.isDarwin [
+      curl
+      CoreServices
+      Security
+    ];
 
   checkFlags = [
     # Disabled because they access the network.
@@ -44,6 +54,7 @@ rustPlatform.buildRustPackage rec {
     "--skip=test_build_internal_zip_extension"
     "--skip=test_build_logs_extension"
     "--skip=test_build_telemetry_extension"
+    "--skip=test_build_zip_workspace"
     "--skip=test_download_example"
     "--skip=test_init_subcommand"
     "--skip=test_init_subcommand_without_override"
@@ -77,6 +88,9 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "cargo-lambda";
     homepage = "https://cargo-lambda.info";
     license = licenses.mit;
-    maintainers = with maintainers; [ taylor1791 calavera ];
+    maintainers = with maintainers; [
+      taylor1791
+      calavera
+    ];
   };
 }

From ef270d885a4c7522720c83a0292b0239fdb6fd29 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Sep 2024 12:10:18 +0000
Subject: [PATCH 64/93] steampipePackages.steampipe-plugin-github: 0.43.0 ->
 0.44.0

---
 .../steampipe-packages/steampipe-plugin-github/default.nix  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix
index 641a0c045827..d09191633c4a 100644
--- a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix
+++ b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-github/default.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "steampipe-plugin-github";
-  version = "0.43.0";
+  version = "0.44.0";
 
   src = fetchFromGitHub {
     owner = "turbot";
     repo = "steampipe-plugin-github";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Kr9JXVLd0E7IG5dq9liS5uQNAX535urETwZytKRaZIA=";
+    hash = "sha256-XscJqrtnvA4poCcUspPIsYIrfI22o/PLeNPBl8WSl/E=";
   };
 
-  vendorHash = "sha256-UivLueePtstJtAWbl7li8FzZ41Q2kF9FYzVYdQ4172g=";
+  vendorHash = "sha256-EVcPpFzRd9EmyuPqZBQjSNEB4BEbU8Km6Y/f+ulfK5s=";
 
   ldflags = [
     "-s"

From cb4da3a54286c8e5bf56cb2f3a1f157123d9adcb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Sep 2024 12:13:54 +0000
Subject: [PATCH 65/93] steampipePackages.steampipe-plugin-aws: 0.146.0 ->
 0.147.0

---
 .../misc/steampipe-packages/steampipe-plugin-aws/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix
index d3dd4049df89..33c09ba83e82 100644
--- a/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix
+++ b/pkgs/tools/misc/steampipe-packages/steampipe-plugin-aws/default.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "steampipe-plugin-aws";
-  version = "0.146.0";
+  version = "0.147.0";
 
   src = fetchFromGitHub {
     owner = "turbot";
     repo = "steampipe-plugin-aws";
     rev = "refs/tags/v${version}";
-    hash = "sha256-8TD00d4pV1NsFR2PqPuKg8rIdaaJjTdCGSbR2yvzg/c=";
+    hash = "sha256-62jGLJGc6tip6Azl5EF1vefJ6IC1+9yMB3oBKjAXWV0=";
   };
 
   vendorHash = "sha256-4MwISeCx/YbJSeQ5OJFIZf1SnK9aD2Eat6xKI7ZtYLk=";

From 91a73c3cc96720c506bc9d5c1e90822b08dd6d0e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Sep 2024 12:59:28 +0000
Subject: [PATCH 66/93] ferium: 4.7.0 -> 4.7.1

---
 pkgs/games/ferium/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/ferium/default.nix b/pkgs/games/ferium/default.nix
index ea9a092d2ccb..294421527d72 100644
--- a/pkgs/games/ferium/default.nix
+++ b/pkgs/games/ferium/default.nix
@@ -9,18 +9,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ferium";
-  version = "4.7.0";
+  version = "4.7.1";
 
   src = fetchFromGitHub {
     owner = "gorilla-devs";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-jj3BdaxH7ofhHNF2eu+burn6+/0bPQQZ8JfjXAFyN4A=";
+    hash = "sha256-eeQjezB6pRdnPADLgDLo8b+bUSP12gfBhFNt/uYCwHU=";
   };
 
   buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];
 
-  cargoHash = "sha256-dysKHi6CqPrF/q7LPn1+TwOP3p2KwauhTuqLCda3OSs=";
+  cargoHash = "sha256-yBi6zyljkYEIUvSH4nXMw8fjPnt4kjqiuZ/QLT5IbqQ=";
 
   # Disable the GUI file picker so that GTK/XDG dependencies aren't used
   buildNoDefaultFeatures = true;

From 9bc055d18da4267d8dc00f47aff15301258fdad7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Sep 2024 13:01:48 +0000
Subject: [PATCH 67/93] goose: 3.22.0 -> 3.22.1

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

diff --git a/pkgs/tools/misc/goose/default.nix b/pkgs/tools/misc/goose/default.nix
index 6b59a49a3141..b329eeea9691 100644
--- a/pkgs/tools/misc/goose/default.nix
+++ b/pkgs/tools/misc/goose/default.nix
@@ -6,17 +6,17 @@
 
 buildGoModule rec {
   pname = "goose";
-  version = "3.22.0";
+  version = "3.22.1";
 
   src = fetchFromGitHub {
     owner = "pressly";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-QY6K/c3VPpHlsm943mcqOBVPk4EDKhu6V+OZxNmjG9Y=";
+    hash = "sha256-rXh50Yv8UXJc+E32Fgg6Iy2K6x5+IM7dmxsvwFuCQ9U=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-JFQFzzeeYNAC6b/VKTvn+O1S3zMJO5aAjj3JO96Db8Y=";
+  vendorHash = "sha256-xb3yBiV+XyOlMp42c+eCj27DpvJalP5qhEoKG1X2kG8=";
 
   # skipping: end-to-end tests require a docker daemon
   postPatch = ''

From ee5a15d93e9ae4fcffa2dc40866543ed5e1fa319 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Sep 2024 13:16:27 +0000
Subject: [PATCH 68/93] kallisto: 0.51.0 -> 0.51.1

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

diff --git a/pkgs/applications/science/biology/kallisto/default.nix b/pkgs/applications/science/biology/kallisto/default.nix
index 5eb6d40d030c..a375df35dd3e 100644
--- a/pkgs/applications/science/biology/kallisto/default.nix
+++ b/pkgs/applications/science/biology/kallisto/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "kallisto";
-  version = "0.51.0";
+  version = "0.51.1";
 
   src = fetchFromGitHub {
     repo = "kallisto";
     owner = "pachterlab";
     rev = "v${version}";
-    sha256 = "sha256-+tnuka6uzoNr5pLuE2yV97KmqdThIG0IwiO+SCYiCk8=";
+    sha256 = "sha256-hfdeztEyHvuOnLS71oSv8sPqFe2UCX5KlANqrT/Gfx8=";
   };
 
   nativeBuildInputs = [ autoconf cmake ];

From 6a18c7b9b71f51dce12d445b7b20d6f328354af0 Mon Sep 17 00:00:00 2001
From: Saturn745 <gitcommits.8lvon@passinbox.com>
Date: Tue, 17 Sep 2024 06:29:10 -0700
Subject: [PATCH 69/93] netbird: 0.29.2 -> 0.29.3

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

diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix
index 85e8d7e725e8..ea111db6d89e 100644
--- a/pkgs/tools/networking/netbird/default.nix
+++ b/pkgs/tools/networking/netbird/default.nix
@@ -31,13 +31,13 @@ let
 in
 buildGo123Module rec {
   pname = "netbird";
-  version = "0.29.2";
+  version = "0.29.3";
 
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = "netbird";
     rev = "v${version}";
-    hash = "sha256-/KKnrxWguPfUysKIUdxYMTrceD6EgdAYQ6QsOjBMKpA";
+    hash = "sha256-0KLx3kxXGriKZqyvcLRoz8y4y729ZQVuOKDkm8p2te4=";
   };
 
   vendorHash = "sha256-CD34U+Z8bUKN0Z4nxIVC+mYDp71Q8q1bmUypRDGgb3U=";

From 1ea5e7c1090733feff5749eea2ff8fec6e8c8cec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Sep 2024 13:59:28 +0000
Subject: [PATCH 70/93] libretro.prboom: unstable-2024-09-05 ->
 unstable-2024-09-07

---
 pkgs/applications/emulators/retroarch/hashes.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json
index 154725424d97..66eef9550606 100644
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@@ -674,10 +674,10 @@
         "src": {
             "owner": "libretro",
             "repo": "libretro-prboom",
-            "rev": "2a96b2a22cf98bdd508b1efc31afceb78717f4ba",
-            "hash": "sha256-Pf6U9RTkMUsRl2mOU6ooFPhVu0G9MZQjJYKVQ9WneIE="
+            "rev": "0b43954c75760d00737120db9d5009813778c7ae",
+            "hash": "sha256-mb7hggdwOjWgKNykeOv+0IDYpKLHy9dJqA4+c/8R6Ss="
         },
-        "version": "unstable-2024-09-05"
+        "version": "unstable-2024-09-07"
     },
     "prosystem": {
         "fetcher": "fetchFromGitHub",

From 7c0167eb3ebd4ed02f7e739efec05b7141018ded Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Sep 2024 14:02:05 +0000
Subject: [PATCH 71/93] libretro.stella: unstable-2024-09-01 ->
 unstable-2024-09-09

---
 pkgs/applications/emulators/retroarch/hashes.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json
index 154725424d97..8bee1edb5d84 100644
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@@ -794,10 +794,10 @@
         "src": {
             "owner": "stella-emu",
             "repo": "stella",
-            "rev": "b1e297153b4e7013a28763253c425a6f4bf31f48",
-            "hash": "sha256-6LPoFX9m6Ads/pZJcMOrJlllluAoCyzyTT6Ngrr84YI="
+            "rev": "03c5d7f1cf3e325e0dc0b41b89ffc17a54834af8",
+            "hash": "sha256-i7EBcbyoLz6MSeDe2d+HRpaKhig0zZEMC7rQqQrpbvA="
         },
-        "version": "unstable-2024-09-01"
+        "version": "unstable-2024-09-09"
     },
     "stella2014": {
         "fetcher": "fetchFromGitHub",

From dc8412781fd21ba33ed9f8564aa165bd7f928057 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Sep 2024 14:47:44 +0000
Subject: [PATCH 72/93] python312Packages.deepl: 1.18.0 -> 1.19.1

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

diff --git a/pkgs/development/python-modules/deepl/default.nix b/pkgs/development/python-modules/deepl/default.nix
index aaa294f39ecb..1dd175a10d55 100644
--- a/pkgs/development/python-modules/deepl/default.nix
+++ b/pkgs/development/python-modules/deepl/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "deepl";
-  version = "1.18.0";
+  version = "1.19.1";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-WuQXY5OUQe28p2QP00QoDL7kfUkGQc41IGkQqLAed44=";
+    hash = "sha256-ufsikWgcQsc/ex/LP5P5fVN3IvfAD9ZOPatwGM+bsqY=";
   };
 
   nativeBuildInputs = [ poetry-core ];

From 770f97722895667b3e64c3cfbda1e164e4aefed0 Mon Sep 17 00:00:00 2001
From: "jose.vazquez" <jose.vazquez@mongodb.com>
Date: Tue, 17 Sep 2024 16:51:08 +0200
Subject: [PATCH 73/93] kubernetes-controller-tools: 0.16.1 -> 0.16.3

---
 .../kubernetes-controller-tools/default.nix   |  8 +++----
 .../kubernetes-controller-tools/version.patch | 23 -------------------
 2 files changed, 3 insertions(+), 28 deletions(-)
 delete mode 100644 pkgs/development/tools/kubernetes-controller-tools/version.patch

diff --git a/pkgs/development/tools/kubernetes-controller-tools/default.nix b/pkgs/development/tools/kubernetes-controller-tools/default.nix
index 2aeab15f5d72..520b0101bc54 100644
--- a/pkgs/development/tools/kubernetes-controller-tools/default.nix
+++ b/pkgs/development/tools/kubernetes-controller-tools/default.nix
@@ -2,18 +2,16 @@
 
 buildGoModule rec {
   pname = "controller-tools";
-  version = "0.16.2";
+  version = "0.16.3";
 
   src = fetchFromGitHub {
     owner = "kubernetes-sigs";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-f12p9d6c3dXOOSnR//bIAs6wB9359GEeN9P1Lfb1/0Y=";
+    sha256 = "sha256-Txvzp8OcRTDCAB8nFrqj93X+Kk/sNPSSLOI07J3DwcM=";
   };
 
-  patches = [ ./version.patch ];
-
-  vendorHash = "sha256-3p9K08WMqDRHHa9116//3lFeaMtRaipD4LyisaKWV7I=";
+  vendorHash = "sha256-nwzXlsSG7JF145bf/AJZB1GbGJRHJC7Q73Jty6mHc/w=";
 
   ldflags = [
     "-s"
diff --git a/pkgs/development/tools/kubernetes-controller-tools/version.patch b/pkgs/development/tools/kubernetes-controller-tools/version.patch
deleted file mode 100644
index b86c3d69c3a9..000000000000
--- a/pkgs/development/tools/kubernetes-controller-tools/version.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/pkg/version/version.go b/pkg/version/version.go
-index 09c8efcf..b9ec798a 100644
---- a/pkg/version/version.go
-+++ b/pkg/version/version.go
-@@ -20,14 +20,12 @@ import (
- 	"runtime/debug"
- )
- 
-+var version string
-+
- // Version returns the version of the main module
- func Version() string {
--	info, ok := debug.ReadBuildInfo()
--	if !ok || info == nil || info.Main.Version == "" {
--		// binary has not been built with module support or doesn't contain a version.
--		return "(unknown)"
--	}
--	return info.Main.Version
-+	_ = debug.ReadBuildInfo
-+	return version
- }
- 
- // Print prints the main module version on stdout.

From 520c7b447ea016ec43a4d26c3b28353f8905e759 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 17 Sep 2024 15:11:33 +0000
Subject: [PATCH 74/93] pupdate: 3.13.0 -> 3.15.0

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

diff --git a/pkgs/by-name/pu/pupdate/package.nix b/pkgs/by-name/pu/pupdate/package.nix
index 270a08551549..9067c323c3ce 100644
--- a/pkgs/by-name/pu/pupdate/package.nix
+++ b/pkgs/by-name/pu/pupdate/package.nix
@@ -11,13 +11,13 @@
 
 buildDotnetModule rec {
   pname = "pupdate";
-  version = "3.13.0";
+  version = "3.15.0";
 
   src = fetchFromGitHub {
     owner = "mattpannella";
     repo = "pupdate";
     rev = "${version}";
-    hash = "sha256-czQU5O0z87v8p2GWYkRkhB5te/lub/yW4bMDd5EkVOQ=";
+    hash = "sha256-oe5Z9psxyPhxwrGVJpq5yXzmCUh3ugBQ4NQ/eoCD9AA=";
   };
 
   buildInputs = [

From cda53f643748ed229c434c39e5e5dcbd31a9a781 Mon Sep 17 00:00:00 2001
From: linsui <36977733+linsui@users.noreply.github.com>
Date: Sat, 7 Sep 2024 18:15:25 +0800
Subject: [PATCH 75/93] vimPlugins.render-markdown: rename to
 render-markdown.nvim

---
 pkgs/applications/editors/vim/plugins/deprecated.json  | 4 ++++
 pkgs/applications/editors/vim/plugins/generated.nix    | 4 ++--
 pkgs/applications/editors/vim/plugins/vim-plugin-names | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/deprecated.json b/pkgs/applications/editors/vim/plugins/deprecated.json
index 1c794d394080..4a5214db0be8 100644
--- a/pkgs/applications/editors/vim/plugins/deprecated.json
+++ b/pkgs/applications/editors/vim/plugins/deprecated.json
@@ -55,6 +55,10 @@
         "date": "2021-11-28",
         "new": "orgmode"
     },
+    "render-markdown": {
+        "date": "2024-09-16",
+        "new": "render-markdown-nvim"
+    },
     "sql-nvim": {
         "date": "2021-09-03",
         "new": "sqlite-lua"
diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 55db14c1d0e3..8cb9f69f46d4 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -17903,8 +17903,8 @@ final: prev:
     meta.homepage = "https://github.com/shaunsingh/moonlight.nvim/";
   };
 
-  render-markdown = buildVimPlugin {
-    pname = "render-markdown";
+  render-markdown-nvim = buildVimPlugin {
+    pname = "render-markdown.nvim";
     version = "2024-09-09";
     src = fetchFromGitHub {
       owner = "MeanderingProgrammer";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 59fa8a6ece60..cba86f4fee7c 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -831,7 +831,7 @@ https://github.com/theprimeagen/refactoring.nvim/,,
 https://github.com/tversteeg/registers.nvim/,,
 https://github.com/vladdoster/remember.nvim/,,
 https://github.com/filipdutescu/renamer.nvim/,,
-https://github.com/MeanderingProgrammer/render-markdown.nvim/,,render-markdown
+https://github.com/MeanderingProgrammer/render-markdown.nvim/,,
 https://github.com/gabrielpoca/replacer.nvim/,HEAD,
 https://github.com/NTBBloodbath/rest.nvim/,,
 https://github.com/vim-scripts/restore_view.vim/,HEAD,restore-view-vim

From 6d6edb9689f90b63f8d39fc0cd1c639b78e0031d Mon Sep 17 00:00:00 2001
From: Enric Morales <me@enric.me>
Date: Thu, 12 Sep 2024 00:55:14 -0400
Subject: [PATCH 76/93] gnu-cobol: move to pkgs/by-name

---
 .../gnu-cobol/default.nix => by-name/gn/gnu-cobol/package.nix}  | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{development/compilers/gnu-cobol/default.nix => by-name/gn/gnu-cobol/package.nix} (100%)

diff --git a/pkgs/development/compilers/gnu-cobol/default.nix b/pkgs/by-name/gn/gnu-cobol/package.nix
similarity index 100%
rename from pkgs/development/compilers/gnu-cobol/default.nix
rename to pkgs/by-name/gn/gnu-cobol/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9f5a5ece5be8..97bf23bde3e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8040,8 +8040,6 @@ with pkgs;
 
   gnu-cim = callPackage ../development/compilers/gnu-cim { };
 
-  gnu-cobol = callPackage ../development/compilers/gnu-cobol { };
-
   gnuclad = callPackage ../applications/graphics/gnuclad { };
 
   gnufdisk = callPackage ../tools/system/fdisk {

From 7293c205fd0257b908eed7a49ba815ce3260e2b6 Mon Sep 17 00:00:00 2001
From: Enric Morales <me@enric.me>
Date: Tue, 17 Sep 2024 11:27:52 -0400
Subject: [PATCH 77/93] gnucobol: rename from gnu-cobol

---
 pkgs/by-name/gn/{gnu-cobol => gnucobol}/package.nix | 6 +++---
 pkgs/top-level/aliases.nix                          | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)
 rename pkgs/by-name/gn/{gnu-cobol => gnucobol}/package.nix (95%)

diff --git a/pkgs/by-name/gn/gnu-cobol/package.nix b/pkgs/by-name/gn/gnucobol/package.nix
similarity index 95%
rename from pkgs/by-name/gn/gnu-cobol/package.nix
rename to pkgs/by-name/gn/gnucobol/package.nix
index 83f24fff864e..e42840bcb163 100644
--- a/pkgs/by-name/gn/gnu-cobol/package.nix
+++ b/pkgs/by-name/gn/gnucobol/package.nix
@@ -19,7 +19,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  pname = "gnu-cobol";
+  pname = "gnucobol";
   version = "3.2";
 
   src = fetchurl {
@@ -107,8 +107,8 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description = "Open-source COBOL compiler";
-    homepage = "https://sourceforge.net/projects/gnucobol/";
+    description = "Free/libre COBOL compiler";
+    homepage = "https://gnu.org/software/gnucobol/";
     license = with licenses; [ gpl3Only lgpl3Only ];
     maintainers = with maintainers; [ ericsagnes lovesegfault techknowlogick ];
     platforms = platforms.all;
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b2a11c0a2549..85be9b0fa166 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -532,6 +532,7 @@ mapAliases ({
   gmpc = throw "'gmpc' has been removed due to lack of maintenance upstream. Consider using 'plattenalbum' instead"; # Added 2024-09-14
   gmtk = throw "'gmtk' has been removed due to lack of maintenance upstream"; # Added 2024-09-14
   gmtp = throw "'gmtp' has been removed due to lack of maintenance upstream. Consider using 'gnome-music' instead"; # Added 2024-09-14
+  gnu-cobol = gnucobol; # Added 2024-09-17
   go-dependency-manager = throw "'go-dependency-manager' is unmaintained and the go community now uses 'go.mod' mostly instead"; # Added 2023-10-04
   gotktrix = throw "'gotktrix' has been removed, as it was broken and unmaintained"; # Added 2023-12-06
   git-backup = throw "git-backup has been removed, as it has been abandoned upstream. Consider using git-backup-go instead.";

From 16686f2b3f11bb6a93310aeea723f167dc05f736 Mon Sep 17 00:00:00 2001
From: Enric Morales <me@enric.me>
Date: Thu, 12 Sep 2024 00:58:04 -0400
Subject: [PATCH 78/93] gnucobol: nixfmt

---
 pkgs/by-name/gn/gnucobol/package.nix | 81 +++++++++++++++++-----------
 1 file changed, 50 insertions(+), 31 deletions(-)

diff --git a/pkgs/by-name/gn/gnucobol/package.nix b/pkgs/by-name/gn/gnucobol/package.nix
index e42840bcb163..f68390c2879a 100644
--- a/pkgs/by-name/gn/gnucobol/package.nix
+++ b/pkgs/by-name/gn/gnucobol/package.nix
@@ -1,20 +1,21 @@
-{ lib
-, stdenv
-, fetchurl
-, autoconf269
-, automake
-, libtool
-, pkg-config
-# libs
-, cjson
-, db
-, gmp
-, libxml2
-, ncurses
-# docs
-, help2man
-, texinfo
-, texliveBasic
+{
+  lib,
+  stdenv,
+  fetchurl,
+  autoconf269,
+  automake,
+  libtool,
+  pkg-config,
+  # libs
+  cjson,
+  db,
+  gmp,
+  libxml2,
+  ncurses,
+  # docs
+  help2man,
+  texinfo,
+  texliveBasic,
 # test
 }:
 
@@ -45,9 +46,14 @@ stdenv.mkDerivation rec {
     ncurses
   ];
 
-  outputs = [ "bin" "dev" "lib" "out" ];
+  outputs = [
+    "bin"
+    "dev"
+    "lib"
+    "out"
+  ];
   # XXX: Without this, we get a cycle between bin and dev
-  propagatedBuildOutputs = [];
+  propagatedBuildOutputs = [ ];
 
   # Skips a broken test
   postPatch = ''
@@ -59,15 +65,17 @@ stdenv.mkDerivation rec {
     sed -i '2894s/^/AT_SKIP_IF([true])/' tests/testsuite.src/run_file.at
   '';
 
-  preConfigure = ''
-    autoconf
-    aclocal
-    automake
-  '' + lib.optionalString stdenv.isDarwin ''
-    # when building with nix on darwin, configure will use GNU strip,
-    # which fails due to using --strip-unneeded, which is not supported
-    substituteInPlace configure --replace-fail '"GNU strip"' 'FAKE GNU strip'
-  '';
+  preConfigure =
+    ''
+      autoconf
+      aclocal
+      automake
+    ''
+    + lib.optionalString stdenv.isDarwin ''
+      # when building with nix on darwin, configure will use GNU strip,
+      # which fails due to using --strip-unneeded, which is not supported
+      substituteInPlace configure --replace-fail '"GNU strip"' 'FAKE GNU strip'
+    '';
 
   # error: call to undeclared function 'xmlCleanupParser'
   # ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
@@ -75,7 +83,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  installFlags = [ "install-pdf" "install-html" "localedir=$out/share/locale" ];
+  installFlags = [
+    "install-pdf"
+    "install-html"
+    "localedir=$out/share/locale"
+  ];
 
   # Tests must run after install.
   doCheck = false;
@@ -109,8 +121,15 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Free/libre COBOL compiler";
     homepage = "https://gnu.org/software/gnucobol/";
-    license = with licenses; [ gpl3Only lgpl3Only ];
-    maintainers = with maintainers; [ ericsagnes lovesegfault techknowlogick ];
+    license = with licenses; [
+      gpl3Only
+      lgpl3Only
+    ];
+    maintainers = with maintainers; [
+      ericsagnes
+      lovesegfault
+      techknowlogick
+    ];
     platforms = platforms.all;
   };
 }

From e1b2d8cfdffc4a4246d637893aab0e6eb246612d Mon Sep 17 00:00:00 2001
From: Enric Morales <me@enric.me>
Date: Thu, 12 Sep 2024 01:08:20 -0400
Subject: [PATCH 79/93] gnucobol: add NIST test suite

---
 pkgs/by-name/gn/gnucobol/package.nix | 32 +++++++++++++++++++---------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/gn/gnucobol/package.nix b/pkgs/by-name/gn/gnucobol/package.nix
index f68390c2879a..62c44ad4a9a1 100644
--- a/pkgs/by-name/gn/gnucobol/package.nix
+++ b/pkgs/by-name/gn/gnucobol/package.nix
@@ -16,15 +16,22 @@
   help2man,
   texinfo,
   texliveBasic,
-# test
+  # test
+  perl,
 }:
-
-stdenv.mkDerivation rec {
+let
+  nistTestSuite = fetchurl {
+    # Used to check GnuCOBOL with the NIST test suite
+    url = "mirror://sourceforge/gnucobol/newcob.val.tar.gz";
+    hash = "sha256-5FE/JqmziRH3v4gv49MzmoC0XKvCyvheswVbD1zofuA=";
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
   pname = "gnucobol";
   version = "3.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/gnucobol/${lib.versions.majorMinor version}/gnucobol-${version}.tar.xz";
+    url = "mirror://gnu/gnucobol/gnucobol-${finalAttrs.version}.tar.xz";
     hash = "sha256-O7SK9GztR3n6z0H9wu5g5My4bqqZ0BCzZoUxXfOcLuI=";
   };
 
@@ -32,8 +39,9 @@ stdenv.mkDerivation rec {
     pkg-config
     autoconf269
     automake
-    libtool
     help2man
+    libtool
+    perl
     texinfo
     texliveBasic
   ];
@@ -59,10 +67,10 @@ stdenv.mkDerivation rec {
   postPatch = ''
     sed -i '/^AT_CHECK.*crud\.cob/i AT_SKIP_IF([true])' tests/testsuite.src/listings.at
     # upstream reports the following tests as known failures
-    # test 843:
-    sed -i '14180i\AT_SKIP_IF([true])' tests/testsuite.src/run_misc.at
-    # test 875:
-    sed -i '2894s/^/AT_SKIP_IF([true])/' tests/testsuite.src/run_file.at
+    # test 843 (runtime check: write to internal storage (1))
+    sed -i "/^843;/d" tests/testsuite
+    # test 875 (INDEXED sample)
+    sed -i "/^875;/d" tests/testsuite
   '';
 
   preConfigure =
@@ -99,6 +107,10 @@ stdenv.mkDerivation rec {
     # Run tests
     TESTSUITEFLAGS="--jobs=$NIX_BUILD_CORES" make check
 
+    # Run NIST tests
+    cp -v ${nistTestSuite} ./tests/cobol85/newcob.val.tar.gz
+    TESTSUITEFLAGS="--jobs=$NIX_BUILD_CORES" make test
+
     # Sanity check
     message="Hello, COBOL!"
     # XXX: Don't for a second think you can just get rid of these spaces, they
@@ -132,4 +144,4 @@ stdenv.mkDerivation rec {
     ];
     platforms = platforms.all;
   };
-}
+})

From 621a378cbbea77fca43c30112a9b2f45bd6d8540 Mon Sep 17 00:00:00 2001
From: Enric Morales <me@enric.me>
Date: Tue, 17 Sep 2024 11:25:10 -0400
Subject: [PATCH 80/93] gnucobol: add kiike to maintainers

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

diff --git a/pkgs/by-name/gn/gnucobol/package.nix b/pkgs/by-name/gn/gnucobol/package.nix
index 62c44ad4a9a1..7c698954e5ab 100644
--- a/pkgs/by-name/gn/gnucobol/package.nix
+++ b/pkgs/by-name/gn/gnucobol/package.nix
@@ -141,6 +141,7 @@ stdenv.mkDerivation (finalAttrs: {
       ericsagnes
       lovesegfault
       techknowlogick
+      kiike
     ];
     platforms = platforms.all;
   };

From bf852e359405f80d1523cfb4ac140a1d6b647b47 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 17 Sep 2024 17:27:54 +0200
Subject: [PATCH 81/93] tiny-cuda-nn: mark as broken on aarch64-linux

---
 .../development/libraries/science/math/tiny-cuda-nn/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix b/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix
index bea271b0cef1..e149f6bd94e2 100644
--- a/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix
+++ b/pkgs/development/libraries/science/math/tiny-cuda-nn/default.nix
@@ -157,5 +157,7 @@ in
       license = licenses.bsd3;
       maintainers = with maintainers; [connorbaker];
       platforms = platforms.linux;
+      # g++: error: unrecognized command-line option '-mf16c'
+      broken = stdenv.isAarch64;
     };
   })

From a284d741a62a12931afa3cca71cc9f8d7bf6afbb Mon Sep 17 00:00:00 2001
From: diadatp <git@diadatp.com>
Date: Thu, 18 Jul 2024 20:38:29 +0530
Subject: [PATCH 82/93] msecli: init at 10.01.012024.00

---
 pkgs/by-name/ms/msecli/package.nix | 65 ++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 pkgs/by-name/ms/msecli/package.nix

diff --git a/pkgs/by-name/ms/msecli/package.nix b/pkgs/by-name/ms/msecli/package.nix
new file mode 100644
index 000000000000..6a2991f90ec4
--- /dev/null
+++ b/pkgs/by-name/ms/msecli/package.nix
@@ -0,0 +1,65 @@
+{
+  autoPatchelfHook,
+  buildFHSEnv,
+  fetchurl,
+  lib,
+  stdenv,
+  zlib,
+}:
+
+let
+  pname = "msecli";
+  version = "10.01.012024.00";
+
+  src = fetchurl {
+    url = "https://web.archive.org/web/20240916144249/https://www.micron.com/content/dam/micron/global/public/products/software/storage-executive-software/msecli/msecli-linux.run";
+    hash = "sha256-IszdD/9fAh+JA26bSR1roXSo8LDU/rf4CuRI3HjU1xc=";
+  };
+
+  buildEnv = buildFHSEnv { name = "msecli-buildEnv"; };
+in
+stdenv.mkDerivation {
+  inherit pname version src;
+
+  buildInputs = [ zlib ];
+
+  nativeBuildInputs = [ autoPatchelfHook ];
+
+  unpackPhase = ''
+    runHook preUnpack
+
+    cp "$src" ${src.name}
+    chmod +x ${src.name}
+
+    runHook postUnpack
+  '';
+
+  buildPhase = ''
+    runHook prebuild
+
+    # ignore the exit code as the installer
+    # fails at optional steps due to read only FHS
+    ${buildEnv}/bin/${buildEnv.name} -c "./${src.name} --mode unattended --prefix bin || true"
+
+    runHook postbuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+    cp -v bin/msecli $out/bin
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Micron Storage Executive CLI";
+    homepage = "https://www.micron.com/sales-support/downloads/software-drivers/storage-executive-software";
+    license = lib.licenses.unfree;
+    mainProgram = "msecli";
+    maintainers = with lib.maintainers; [ diadatp ];
+    platforms = [ "x86_64-linux" ];
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+  };
+}

From 2daad926b8a2eaf5708152f36f18573959ca6f29 Mon Sep 17 00:00:00 2001
From: ChaosAttractor <lostattractor@gmail.com>
Date: Wed, 18 Sep 2024 00:59:37 +0800
Subject: [PATCH 83/93] nixos/services.cloudflared: fix syntax errors

---
 nixos/modules/services/networking/cloudflared.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/cloudflared.nix b/nixos/modules/services/networking/cloudflared.nix
index c328d1de43c6..7023e79d31f9 100644
--- a/nixos/modules/services/networking/cloudflared.nix
+++ b/nixos/modules/services/networking/cloudflared.nix
@@ -273,11 +273,11 @@ in
             ingressesSet = filterIngressSet tunnel.ingress;
             ingressesStr = filterIngressStr tunnel.ingress;
 
-            fullConfig = lib.filterConfig {
+            fullConfig = filterConfig {
               tunnel = name;
               "credentials-file" = tunnel.credentialsFile;
-              warp-routing = lib.filterConfig tunnel.warp-routing;
-              originRequest = lib.filterConfig tunnel.originRequest;
+              warp-routing = filterConfig tunnel.warp-routing;
+              originRequest = filterConfig tunnel.originRequest;
               ingress =
                 (map
                   (key: {

From df86bea46f32d1ce698b86841452c7fa63700243 Mon Sep 17 00:00:00 2001
From: u2x1 <u2x1@outlook.com>
Date: Wed, 18 Sep 2024 01:03:05 +0800
Subject: [PATCH 84/93] cups-brother-dcpt725dw: init at 3.5.0-1

---
 .../cu/cups-brother-dcpt725dw/package.nix     | 113 ++++++++++++++++++
 1 file changed, 113 insertions(+)
 create mode 100644 pkgs/by-name/cu/cups-brother-dcpt725dw/package.nix

diff --git a/pkgs/by-name/cu/cups-brother-dcpt725dw/package.nix b/pkgs/by-name/cu/cups-brother-dcpt725dw/package.nix
new file mode 100644
index 000000000000..b93e8e1fc32f
--- /dev/null
+++ b/pkgs/by-name/cu/cups-brother-dcpt725dw/package.nix
@@ -0,0 +1,113 @@
+{
+  stdenv,
+  lib,
+  fetchurl,
+  perl,
+  ghostscript,
+  coreutils,
+  gnugrep,
+  which,
+  file,
+  gnused,
+  dpkg,
+  makeWrapper,
+  libredirect,
+  debugLvl ? "0",
+}:
+
+stdenv.mkDerivation rec {
+  pname = "cups-brother-dcpt725dw";
+  version = "3.5.0-1";
+  src = fetchurl {
+    url = "https://download.brother.com/welcome/dlf105181/dcpt725dwpdrv-${version}.i386.deb";
+    hash = "sha256-fK6RHaW/ej1nFgSaTbzWxVgjIW32YTbJbd1xD37ZE7c=";
+  };
+
+  nativeBuildInputs = [
+    dpkg
+    makeWrapper
+  ];
+  buildInputs = [ perl ];
+
+  dontUnpack = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out
+    dpkg-deb -x $src $out
+
+    LPDDIR=$out/opt/brother/Printers/dcpt725dw/lpd
+    WRAPPER=$out/opt/brother/Printers/dcpt725dw/cupswrapper/brother_lpdwrapper_dcpt725dw
+
+    ln -s $LPDDIR/${stdenv.hostPlatform.linuxArch}/* $LPDDIR/
+
+    substituteInPlace $WRAPPER \
+      --replace-fail "PRINTER =~" "PRINTER = \"dcpt725dw\"; #" \
+      --replace-fail "basedir =~" "basedir = \"$out/opt/brother/Printers/dcpt725dw/\"; #" \
+      --replace-fail "lpdconf = " "lpdconf = \$lpddir.'/'.\$LPDCONFIGEXE.\$PRINTER; #" \
+      --replace-fail "\$DEBUG=0;" "\$DEBUG=${debugLvl};"
+
+    substituteInPlace $LPDDIR/filter_dcpt725dw \
+      --replace-fail "BR_PRT_PATH =~" "BR_PRT_PATH = \"$out/opt/brother/Printers/dcpt725dw/\"; #" \
+      --replace-fail "PRINTER =~" "PRINTER = \"dcpt725dw\"; #"
+
+    wrapProgram $WRAPPER \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          coreutils
+          gnugrep
+          gnused
+        ]
+      }
+
+    wrapProgram $LPDDIR/filter_dcpt725dw \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          coreutils
+          ghostscript
+          gnugrep
+          gnused
+          which
+          file
+        ]
+      }
+
+    patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+      $LPDDIR/brdcpt725dwfilter
+
+    patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+      $LPDDIR/brprintconf_dcpt725dw
+
+    wrapProgram $LPDDIR/brprintconf_dcpt725dw \
+      --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
+      --set NIX_REDIRECTS /opt=$out/opt
+
+    wrapProgram $LPDDIR/brdcpt725dwfilter \
+      --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \
+      --set NIX_REDIRECTS /opt=$out/opt
+
+    mkdir -p "$out/lib/cups/filter" "$out/share/cups/model"
+
+    ln -s $out/opt/brother/Printers/dcpt725dw/cupswrapper/brother_lpdwrapper_dcpt725dw \
+      $out/lib/cups/filter/brother_lpdwrapper_dcpt725dw
+
+    ln -s "$out/opt/brother/Printers/dcpt725dw/cupswrapper/brother_dcpt725dw_printer_en.ppd" \
+      "$out/share/cups/model/"
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Brother DCP-T725DW printer driver";
+    license = licenses.unfree;
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    maintainers = with maintainers; [ u2x1 ];
+    platforms = [
+      "x86_64-linux"
+      "i686-linux"
+    ];
+    downloadPage = "https://support.brother.com/g/b/downloadtop.aspx?c=cn_ot&lang=en&prod=dcpt725dw_cn";
+    homepage = "http://www.brother.com/";
+  };
+}

From a797b80b6decb91fa8aa6ec1273b0b3e00b587ee Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 13 Sep 2024 14:01:50 +0300
Subject: [PATCH 85/93] vulkan-loader: backport fix for 32-bit applications on
 64-bit inode filesystems

---
 pkgs/development/libraries/vulkan-loader/default.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix
index 352060ef8dcb..a43dda1b5f83 100644
--- a/pkgs/development/libraries/vulkan-loader/default.nix
+++ b/pkgs/development/libraries/vulkan-loader/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, libX11, libxcb
+{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, pkg-config, libX11, libxcb
 , libXrandr, wayland, moltenvk, vulkan-headers, addDriverRunpath
 , testers }:
 
@@ -13,7 +13,15 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-z26xvp7bKaOQAXF+/Sk24Syuw3N9QXc6sk2vlQwceJ8=";
   };
 
-  patches = [ ./fix-pkgconfig.patch ];
+  patches = [ ./fix-pkgconfig.patch ]
+    ++ lib.optionals stdenv.is32bit [
+      # Backport patch to support 64-bit inodes on 32-bit systems
+      # FIXME: remove in next update
+      (fetchpatch {
+        url = "https://github.com/KhronosGroup/Vulkan-Loader/commit/ecd88b5c6b1e4c072c55c8652d76513d74c5ad4e.patch";
+        hash = "sha256-Ea+v+RfmVl8fRbkr2ETM3/7R4vp+jw7hvTq2hnw4V/0=";
+      })
+    ];
 
   nativeBuildInputs = [ cmake pkg-config ];
   buildInputs = [ vulkan-headers ]

From 65629db5d025469512d951aa1d173e8254c5399d Mon Sep 17 00:00:00 2001
From: hatch01 <42416805+hatch01@users.noreply.github.com>
Date: Tue, 17 Sep 2024 21:18:53 +0200
Subject: [PATCH 86/93] homepage-dashboard: 0.9.8 -> 0.9.9

---
 pkgs/servers/homepage-dashboard/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/homepage-dashboard/default.nix b/pkgs/servers/homepage-dashboard/default.nix
index 71a610ecd9a5..0b957e6337b9 100644
--- a/pkgs/servers/homepage-dashboard/default.nix
+++ b/pkgs/servers/homepage-dashboard/default.nix
@@ -29,16 +29,16 @@ let
 in
 buildNpmPackage rec {
   pname = "homepage-dashboard";
-  version = "0.9.8";
+  version = "0.9.9";
 
   src = fetchFromGitHub {
     owner = "gethomepage";
     repo = "homepage";
     rev = "v${version}";
-    hash = "sha256-WfNUBjg/D3g6GE9ljZZ2lcHBx4XA2ObKjGgQ1VNanv8=";
+    hash = "sha256-jUKXAqq6Oj8CmOuBUlsf0zDIcK+3MX/czzNDmakN9VM=";
   };
 
-  npmDepsHash = "sha256-PKqOeTspwlnKhQz65Z2C+GmQu6YTMRyaROgF8dZOdV8=";
+  npmDepsHash = "sha256-YjcF8FkURnTurcJ0Iq0ghv/bhu5sFA860jXrn3TkRds=";
 
   preBuild = ''
     mkdir -p config

From 51e70f4f9b42a38efd871d5e197171dcb0844bfe Mon Sep 17 00:00:00 2001
From: ghpzin <ghpzin@gmail.com>
Date: Mon, 16 Sep 2024 19:35:40 +0300
Subject: [PATCH 87/93] dupe-krill: remove Cargo.lock, fix hashes

- upstream added Cargo.lock in 1.4.9, use it instead of keeping one in
nixpkgs:
https://github.com/kornelski/dupe-krill/commit/ad3430c076212a62f614fefb6562412c045fb0dd
- fix hashes
---
 pkgs/tools/filesystems/dupe-krill/Cargo.lock  | 339 ------------------
 pkgs/tools/filesystems/dupe-krill/default.nix |   7 +-
 2 files changed, 2 insertions(+), 344 deletions(-)
 delete mode 100644 pkgs/tools/filesystems/dupe-krill/Cargo.lock

diff --git a/pkgs/tools/filesystems/dupe-krill/Cargo.lock b/pkgs/tools/filesystems/dupe-krill/Cargo.lock
deleted file mode 100644
index 98c3d7157a1a..000000000000
--- a/pkgs/tools/filesystems/dupe-krill/Cargo.lock
+++ /dev/null
@@ -1,339 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 3
-
-[[package]]
-name = "arrayref"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
-
-[[package]]
-name = "arrayvec"
-version = "0.7.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6"
-
-[[package]]
-name = "autocfg"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "blake3"
-version = "1.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a08e53fc5a564bb15bfe6fae56bd71522205f1f91893f9c0116edad6496c183f"
-dependencies = [
- "arrayref",
- "arrayvec",
- "cc",
- "cfg-if",
- "constant_time_eq",
- "digest",
-]
-
-[[package]]
-name = "block-buffer"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e"
-dependencies = [
- "generic-array",
-]
-
-[[package]]
-name = "cc"
-version = "1.0.73"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
-
-[[package]]
-name = "constant_time_eq"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc"
-
-[[package]]
-name = "crypto-common"
-version = "0.1.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
-dependencies = [
- "generic-array",
- "typenum",
-]
-
-[[package]]
-name = "ctrlc"
-version = "3.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d91974fbbe88ec1df0c24a4f00f99583667a7e2e6272b2b92d294d81e462173"
-dependencies = [
- "nix",
- "winapi",
-]
-
-[[package]]
-name = "digest"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adfbc57365a37acbd2ebf2b64d7e69bb766e2fea813521ed536f5d0520dcf86c"
-dependencies = [
- "block-buffer",
- "crypto-common",
- "subtle",
-]
-
-[[package]]
-name = "dupe-krill"
-version = "1.4.8"
-dependencies = [
- "blake3",
- "ctrlc",
- "getopts",
- "serde",
- "serde_derive",
- "serde_json",
- "smallvec",
- "tempdir",
-]
-
-[[package]]
-name = "fuchsia-cprng"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
-
-[[package]]
-name = "generic-array"
-version = "0.14.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
-dependencies = [
- "typenum",
- "version_check",
-]
-
-[[package]]
-name = "getopts"
-version = "0.2.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
-dependencies = [
- "unicode-width",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc"
-
-[[package]]
-name = "libc"
-version = "0.2.135"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c"
-
-[[package]]
-name = "nix"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e322c04a9e3440c327fca7b6c8a63e6890a32fa2ad689db972425f07e0d22abb"
-dependencies = [
- "autocfg",
- "bitflags",
- "cfg-if",
- "libc",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.47"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "rand"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293"
-dependencies = [
- "fuchsia-cprng",
- "libc",
- "rand_core 0.3.1",
- "rdrand",
- "winapi",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
-dependencies = [
- "rand_core 0.4.2",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
-
-[[package]]
-name = "rdrand"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2"
-dependencies = [
- "rand_core 0.3.1",
-]
-
-[[package]]
-name = "remove_dir_all"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "ryu"
-version = "1.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4501abdff3ae82a1c1b477a17252eb69cee9e66eb915c1abaa4f44d873df9f09"
-
-[[package]]
-name = "serde"
-version = "1.0.145"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "728eb6351430bccb993660dfffc5a72f91ccc1295abaa8ce19b27ebe4f75568b"
-
-[[package]]
-name = "serde_derive"
-version = "1.0.145"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81fa1584d3d1bcacd84c277a0dfe21f5b0f6accf4a23d04d4c6d61f1af522b4c"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.86"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41feea4228a6f1cd09ec7a3593a682276702cd67b5273544757dae23c096f074"
-dependencies = [
- "itoa",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "smallvec"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
-
-[[package]]
-name = "subtle"
-version = "2.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
-
-[[package]]
-name = "syn"
-version = "1.0.102"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "tempdir"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8"
-dependencies = [
- "rand",
- "remove_dir_all",
-]
-
-[[package]]
-name = "typenum"
-version = "1.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
-
-[[package]]
-name = "version_check"
-version = "0.9.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/pkgs/tools/filesystems/dupe-krill/default.nix b/pkgs/tools/filesystems/dupe-krill/default.nix
index 7c2594a8adef..be0b3cc5ff37 100644
--- a/pkgs/tools/filesystems/dupe-krill/default.nix
+++ b/pkgs/tools/filesystems/dupe-krill/default.nix
@@ -8,13 +8,10 @@ rustPlatform.buildRustPackage rec {
     owner = "kornelski";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-ceeKG45OQLxiYcwq2Kumbpd+lkyY+W/og1/6Zdpd3zo=";
-    postFetch = ''
-      cp ${./Cargo.lock} $out/Cargo.lock
-    '';
+    hash = "sha256-ze9OQHNtujzn2rY24bmFUkz5AYsjoMrwqm4jyQoF53Y=";
   };
 
-  cargoHash = "sha256-jEMvvFOcFij4lT/5Y5xARaVURT/evV9u1Vkqtm4al+g=";
+  cargoHash = "sha256-9/TSmw0XEnEURgrT6Oy3nqnNkmXUHLr0InlKyg4m9sQ=";
 
   meta = with lib; {
     description = "Fast file deduplicator";

From 043384277814640ef1b88f8857b9fa4c45acdb2b Mon Sep 17 00:00:00 2001
From: Jacek Galowicz <jacek@galowicz.de>
Date: Tue, 3 Sep 2024 11:16:31 +0200
Subject: [PATCH 88/93] sqlitebrowser: Fix build for macOS

---
 .../tools/database/sqlitebrowser/default.nix  | 23 +++--
 .../tools/database/sqlitebrowser/macos.patch  | 86 +++++++++++++++++++
 2 files changed, 100 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/development/tools/database/sqlitebrowser/macos.patch

diff --git a/pkgs/development/tools/database/sqlitebrowser/default.nix b/pkgs/development/tools/database/sqlitebrowser/default.nix
index 96d9c035be30..6b97b1c373d5 100644
--- a/pkgs/development/tools/database/sqlitebrowser/default.nix
+++ b/pkgs/development/tools/database/sqlitebrowser/default.nix
@@ -1,30 +1,35 @@
-{ lib, stdenv, mkDerivation, fetchFromGitHub, cmake
-, qtbase, qttools, sqlcipher, wrapGAppsHook3, qtmacextras
+{ lib, stdenv, fetchFromGitHub, cmake
+, qtbase, qttools, sqlcipher, wrapQtAppsHook, qtmacextras
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "sqlitebrowser";
   version = "3.13.0";
 
   src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
-    rev = "v${version}";
+    owner = "sqlitebrowser";
+    repo = "sqlitebrowser";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-2U0jnL2hmrxynMxEiObl10bKFAFlCrY2hulZ/Ggqimw=";
   };
 
+  patches = lib.optional stdenv.isDarwin ./macos.patch;
+
   # We should be using qscintilla from nixpkgs instead of the vendored version,
   # but qscintilla is currently in a bit of a mess as some consumers expect a
   # -qt4 or -qt5 prefix while others do not.
   # We *really* should get that cleaned up.
-  buildInputs = [ qtbase sqlcipher ] ++ lib.optionals stdenv.isDarwin [ qtmacextras ];
+  buildInputs = [ qtbase sqlcipher ] ++ lib.optional stdenv.isDarwin qtmacextras;
 
-  nativeBuildInputs = [ cmake qttools wrapGAppsHook3 ];
+  nativeBuildInputs = [ cmake qttools wrapQtAppsHook ];
 
   cmakeFlags = [
     "-Dsqlcipher=1"
+    (lib.cmakeBool "ENABLE_TESTING" (finalAttrs.doCheck or false))
   ];
 
+  doCheck = true;
+
   meta = with lib; {
     description = "DB Browser for SQLite";
     mainProgram = "sqlitebrowser";
@@ -33,4 +38,4 @@ mkDerivation rec {
     maintainers = with maintainers; [ peterhoeg ];
     platforms = platforms.unix;
   };
-}
+})
diff --git a/pkgs/development/tools/database/sqlitebrowser/macos.patch b/pkgs/development/tools/database/sqlitebrowser/macos.patch
new file mode 100644
index 000000000000..6da7d67a0326
--- /dev/null
+++ b/pkgs/development/tools/database/sqlitebrowser/macos.patch
@@ -0,0 +1,86 @@
+diff -ru source/CMakeLists.txt source-patched/CMakeLists.txt
+--- source/CMakeLists.txt	1970-01-01 01:00:01.000000000 +0100
++++ source-patched/CMakeLists.txt	2024-09-03 11:09:48.289053141 +0200
+@@ -39,9 +39,7 @@
+ set(CMAKE_AUTOMOC ON)
+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+ 
+-if(APPLE)
+-    add_executable(${PROJECT_NAME} MACOSX_BUNDLE)
+-elseif(WIN32)
++if(WIN32)
+     add_executable(${PROJECT_NAME} WIN32)
+ else()
+     add_executable(${PROJECT_NAME})
+@@ -106,33 +104,6 @@
+     list(PREPEND CMAKE_PREFIX_PATH ${QT5_PATH} ${SQLITE3_PATH})
+ endif()
+ 
+-
+-if(APPLE)
+-    # For Intel Mac's
+-    if(EXISTS /usr/local/opt/qt5)
+-        list(APPEND CMAKE_PREFIX_PATH "/usr/local/opt/qt5")
+-    endif()
+-
+-    # For Apple Silicon Mac's
+-    if(EXISTS /opt/homebrew/opt/qt5)
+-        list(APPEND CMAKE_PREFIX_PATH "/opt/homebrew/opt/qt5")
+-    endif()
+-    if(EXISTS /opt/homebrew/opt/sqlitefts5)
+-        list(PREPEND CMAKE_PREFIX_PATH "/opt/homebrew/opt/sqlitefts5")
+-    endif()
+-
+-    # For Apple Silicon Mac's and install dependencies via our Homebrew tap(sqlitebrowser/homebrew-tap)
+-    if(customTap AND EXISTS /opt/homebrew/opt/)
+-        list(PREPEND CMAKE_PREFIX_PATH "/opt/homebrew/opt/sqlb-qt@5")
+-        list(PREPEND CMAKE_PREFIX_PATH "/opt/homebrew/opt/sqlb-sqlite")
+-
+-        if(sqlcipher)
+-            list(APPEND SQLCIPHER_INCLUDE_DIR "/opt/homebrew/include")
+-            list(APPEND SQLCIPHER_LIBRARY "/opt/homebrew/opt/sqlb-sqlcipher/lib/libsqlcipher.0.dylib")
+-        endif()
+-    endif()
+-endif()
+-
+ find_package(Qt5 REQUIRED COMPONENTS Concurrent Gui LinguistTools Network PrintSupport Test Widgets Xml)
+ 
+ if(NOT FORCE_INTERNAL_QSCINTILLA)
+@@ -439,13 +410,6 @@
+     set(LIBSQLITE_NAME SQLite3)
+ endif()
+ 
+-# add extra library path for MacOS and FreeBSD
+-set(EXTRAPATH APPLE OR ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
+-if(EXTRAPATH)
+-    list(PREPEND CMAKE_PREFIX_PATH /usr/local/opt/sqlite/lib)
+-    list(PREPEND CMAKE_PREFIX_PATH /usr/local/opt/sqlitefts5/lib)
+-endif()
+-
+ find_package(${LIBSQLITE_NAME})
+ if (sqlcipher)
+     target_link_libraries(${PROJECT_NAME} SQLCipher::SQLCipher)
+@@ -510,7 +474,7 @@
+     endif()
+ endif()
+ 
+-if((NOT WIN32 AND NOT APPLE) OR MINGW)
++if(NOT WIN32 OR MINGW)
+     install(TARGETS ${PROJECT_NAME}
+         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+@@ -630,14 +594,6 @@
+     )
+ endif()
+ 
+-if(APPLE)
+-    set_target_properties(${PROJECT_NAME} PROPERTIES
+-        BUNDLE True
+-        OUTPUT_NAME "DB Browser for SQLite"
+-        MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/src/app.plist
+-    )
+-endif()
+-
+ # CPack configuration
+ set(CPACK_STRIP_FILES ON)
+ set(CPACK_DEBIAN_PACKAGE_PRIORITY optional)

From 2d8261dc0940886ffd95848c9e73b77e0caabfb8 Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@hoeg.com>
Date: Tue, 17 Sep 2024 22:00:57 +0200
Subject: [PATCH 89/93] rdiff-backup: add meta.mainProgram

---
 pkgs/tools/backup/rdiff-backup/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix
index bf797a16cbfd..33050e805f9a 100644
--- a/pkgs/tools/backup/rdiff-backup/default.nix
+++ b/pkgs/tools/backup/rdiff-backup/default.nix
@@ -27,6 +27,7 @@ pypkgs.buildPythonApplication rec {
     homepage = "https://rdiff-backup.net";
     license = licenses.gpl2Only;
     maintainers = with maintainers; [ peterhoeg ];
+    mainProgram = "rdiff-backup";
     platforms = platforms.all;
   };
 }

From 883679e00f685c87951931ffbde886ac9bf606aa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 13 Sep 2024 08:32:37 +0000
Subject: [PATCH 90/93] strawberry-qt6: 1.1.1 -> 1.1.2

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

diff --git a/pkgs/applications/audio/strawberry/default.nix b/pkgs/applications/audio/strawberry/default.nix
index f46ba519951b..9179ecccef07 100644
--- a/pkgs/applications/audio/strawberry/default.nix
+++ b/pkgs/applications/audio/strawberry/default.nix
@@ -44,13 +44,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "strawberry";
-  version = "1.1.1";
+  version = "1.1.2";
 
   src = fetchFromGitHub {
     owner = "jonaski";
     repo = pname;
     rev = version;
-    hash = "sha256-REoki+8rneQ+4rL9rC7Md5Hrj6ftd7RePEF1fK4FnKY=";
+    hash = "sha256-86AMmp8R9/NibTsMFTTFcMeIqZ5x8din9RcBvhGO9xg=";
     fetchSubmodules = true;
   };
 

From 00dd6265c4c59126eb99f20963f1a3d1befee017 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 17 Sep 2024 22:54:18 +0200
Subject: [PATCH 91/93] python312Packages.orbax-checkpoint: 0.6.3 -> 0.6.4

Diff: https://github.com/google/orbax/compare/refs/tags/v0.6.3...v0.6.4

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

diff --git a/pkgs/development/python-modules/orbax-checkpoint/default.nix b/pkgs/development/python-modules/orbax-checkpoint/default.nix
index 9cfbc560ed43..b9cba25f3e8a 100644
--- a/pkgs/development/python-modules/orbax-checkpoint/default.nix
+++ b/pkgs/development/python-modules/orbax-checkpoint/default.nix
@@ -32,14 +32,14 @@
 
 buildPythonPackage rec {
   pname = "orbax-checkpoint";
-  version = "0.6.3";
+  version = "0.6.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "orbax";
     rev = "refs/tags/v${version}";
-    hash = "sha256-yqccXQGEvxYnWP8rWmRLjjB0pkSEeXBrRvJIwVowUx0=";
+    hash = "sha256-xd75/AKBFUdA6a8sQnCB2rVbHl/Foy4LTb07jnwrTjA=";
   };
 
   sourceRoot = "${src.name}/checkpoint";

From 3aea9d6aaa32125a53950a8ed65bbdca73fe43f5 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 17 Sep 2024 23:13:35 +0200
Subject: [PATCH 92/93] python312Packages.std2: unstable-2023-10-07 ->
 0-unstable-2024-09-02

Diff:
https://github.com/ms-jpq/std2/compare/6332e559ee51c3a7c956804afdd7e1cc6ad47965...205d1f52e9b5438ef2b732c77e1144847cafa8d0
---
 pkgs/development/python-modules/std2/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/std2/default.nix b/pkgs/development/python-modules/std2/default.nix
index aa46ad29dd9f..f25c28601d12 100644
--- a/pkgs/development/python-modules/std2/default.nix
+++ b/pkgs/development/python-modules/std2/default.nix
@@ -7,22 +7,22 @@
 
 buildPythonPackage {
   pname = "std2";
-  version = "unstable-2023-10-07";
+  version = "0-unstable-2024-09-02";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ms-jpq";
     repo = "std2";
-    rev = "6332e559ee51c3a7c956804afdd7e1cc6ad47965";
-    hash = "sha256-huN7P/Ws6anrFXDG7L5xxMenS25BHquV9cMi1s7WFJ4=";
+    rev = "205d1f52e9b5438ef2b732c77e1144847cafa8d0";
+    hash = "sha256-WdUefadEk92cGnDI+KbQBpjg+d7KgI6bjlQlyhRRRFA=";
   };
 
   nativeBuildInputs = [ setuptools ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/ms-jpq/std2";
     description = "Dependency to chadtree and coq_nvim plugins";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ GaetanLepage ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
   };
 }

From fc47f9c5600bc944f6675b3bf0512f437d96634c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 17 Sep 2024 23:28:25 +0200
Subject: [PATCH 93/93] python312Packages.orbax-checkpoint: adjust changelog
 URL

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

diff --git a/pkgs/development/python-modules/orbax-checkpoint/default.nix b/pkgs/development/python-modules/orbax-checkpoint/default.nix
index b9cba25f3e8a..ccf370682b5b 100644
--- a/pkgs/development/python-modules/orbax-checkpoint/default.nix
+++ b/pkgs/development/python-modules/orbax-checkpoint/default.nix
@@ -91,7 +91,7 @@ buildPythonPackage rec {
   meta = {
     description = "Orbax provides common utility libraries for JAX users";
     homepage = "https://github.com/google/orbax/tree/main/checkpoint";
-    changelog = "https://github.com/google/orbax/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/google/orbax/releases/tag/v${version}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };