From d88ea29d11fbd49d2155446cd51afa245322ce34 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sun, 15 Sep 2024 12:14:51 +0300
Subject: [PATCH 01/39] minivmac: init at 2024.06.08

---
 pkgs/by-name/mi/minivmac/package.nix | 53 ++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 pkgs/by-name/mi/minivmac/package.nix

diff --git a/pkgs/by-name/mi/minivmac/package.nix b/pkgs/by-name/mi/minivmac/package.nix
new file mode 100644
index 000000000000..a143585f5280
--- /dev/null
+++ b/pkgs/by-name/mi/minivmac/package.nix
@@ -0,0 +1,53 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  buildPackages,
+  alsa-lib,
+  xorg,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "minivmac-erichelgeson";
+  version = "2024.06.08";
+
+  src = fetchFromGitHub {
+    owner = "erichelgeson";
+    repo = "minivmac";
+    rev = version;
+    hash = "sha256-iiEE0ioXh3keKUPfAB+YcE1iggGLpxT9N8LSVFDhttE=";
+  };
+
+  buildInputs = [ xorg.libX11 ];
+
+  makeFlags = [ "PREFIX=${placeholder "out"}" ];
+
+  configurePhase = ''
+    ${lib.getExe' buildPackages.stdenv.cc "cc"} setup/tool.c -o setup_t
+    ./setup_t -t lx64 > setup.sh
+
+    # Patch hardcoded references in setup.sh to cross-aware counterparts
+    substituteInPlace setup.sh --replace 'gcc ' '${stdenv.cc.targetPrefix}cc '
+    substituteInPlace setup.sh --replace 'strip --strip-unneeded' '${stdenv.cc.targetPrefix}strip --strip-unneeded'
+
+    sh < ./setup.sh
+  '';
+
+  installPhase = ''
+    install -Dm755 -t $out/bin ./minivmac
+  '';
+
+  # ensure libasound can be dlopen()'ed
+  postFixup = ''
+    patchelf --add-rpath "${lib.getLib alsa-lib}/lib" $out/bin/minivmac
+  '';
+
+  meta = with lib; {
+    description = "miniature early Macintosh emulator (fork from erichelgeson)";
+    homepage = "https://github.com/erichelgeson/minivmac";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.flokli ];
+    platforms = platforms.linux;
+    sourceProvenance = [ sourceTypes.fromSource ];
+  };
+}

From 8f92904d89d15a699a24a9747e33d3e29e4bfa3d Mon Sep 17 00:00:00 2001
From: Congee <congeec@qq.com>
Date: Wed, 25 Sep 2024 11:41:17 -0400
Subject: [PATCH 02/39] ra-multiplex: 0.2.2 -> 0.2.5

---
 pkgs/development/tools/rust/ra-multiplex/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/rust/ra-multiplex/default.nix b/pkgs/development/tools/rust/ra-multiplex/default.nix
index 0eb064010109..77e7e33e9f5d 100644
--- a/pkgs/development/tools/rust/ra-multiplex/default.nix
+++ b/pkgs/development/tools/rust/ra-multiplex/default.nix
@@ -5,18 +5,18 @@
 , rust-analyzer
 }:
 
-rustPlatform.buildRustPackage {
+rustPlatform.buildRustPackage rec {
   pname = "ra-multiplex";
-  version = "0.2.2";
+  version = "0.2.5";
 
   src = fetchFromGitHub {
     owner = "pr2502";
     repo = "ra-multiplex";
-    rev = "dcb5f83890cb91016b0a1590cc1b732606bb6ec1";
-    hash = "sha256-Hf4Gj9eXEP4gXiqNV4Jq0oiGLX3DtDF9At1feEZ+bUE=";
+    rev = "v${version}";
+    hash = "sha256-aBrn9g+MGXLAsOmHqw1Tt6NPFGJTyYv/L9UI/vQU4i8=";
   };
 
-  cargoHash = "sha256-MeUtkPjOsL1kQ2W0Q1/OqhKDVXs4cECkATHISpyfp9U=";
+  cargoHash = "sha256-Z5KK+tFkQjnZkU1wNT0Xk1ERjYcQT8MNGDBK53u36hE=";
 
   nativeBuildInputs = [ makeWrapper ];
 

From db9b9f9a49ca787caad81db239d2663a953b8248 Mon Sep 17 00:00:00 2001
From: Congee <congeec@qq.com>
Date: Wed, 25 Sep 2024 14:47:40 -0400
Subject: [PATCH 03/39] ra-multiplex: fix typo on wrapProgram --suffix PATH

---
 pkgs/development/tools/rust/ra-multiplex/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/rust/ra-multiplex/default.nix b/pkgs/development/tools/rust/ra-multiplex/default.nix
index 77e7e33e9f5d..6efa73f23d7b 100644
--- a/pkgs/development/tools/rust/ra-multiplex/default.nix
+++ b/pkgs/development/tools/rust/ra-multiplex/default.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
 
   postInstall = ''
     wrapProgram $out/bin/ra-multiplex \
-      --suffix PATH ${lib.makeBinPath [ rust-analyzer ]}
+      --suffix PATH : ${lib.makeBinPath [ rust-analyzer ]}
   '';
 
   meta = with lib; {

From e9fade465fa856d80c47ac1a3ecc61c19c907cf4 Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Tue, 1 Oct 2024 08:16:58 -0300
Subject: [PATCH 04/39] fluxcd/update-script: use nix hash convert

Eliminates deprecation warning of former pattern.
---
 pkgs/by-name/fl/fluxcd/update.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fl/fluxcd/update.sh b/pkgs/by-name/fl/fluxcd/update.sh
index 218eba0be91a..d81089203867 100755
--- a/pkgs/by-name/fl/fluxcd/update.sh
+++ b/pkgs/by-name/fl/fluxcd/update.sh
@@ -12,9 +12,9 @@ LATEST_VERSION=$(echo ${LATEST_TAG} | sed 's/^v//')
 
 if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then
     SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/fluxcd/flux2/archive/refs/tags/${LATEST_TAG}.tar.gz)
-    SHA256=$(nix hash to-sri --type sha256 $SHA256)
+    SHA256=$(nix hash convert --hash-algo sha256 --to sri $SHA256)
     SPEC_SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/fluxcd/flux2/releases/download/${LATEST_TAG}/manifests.tar.gz)
-    SPEC_SHA256=$(nix hash to-sri --type sha256 $SPEC_SHA256)
+    SPEC_SHA256=$(nix hash convert --hash-algo sha256 --to sri $SPEC_SHA256)
 
     setKV () {
         sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" "${FLUXCD_PATH}/package.nix"
@@ -27,7 +27,7 @@ if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then
 
     set +e
     VENDOR_HASH=$(nix-build --no-out-link -A fluxcd $NIXPKGS_PATH 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g')
-    VENDOR_HASH=$(nix hash to-sri --type sha256 $VENDOR_HASH)
+    VENDOR_HASH=$(nix hash convert --hash-algo sha256 --to sri $VENDOR_HASH)
     set -e
 
     if [ -n "${VENDOR_HASH:-}" ]; then

From edfec4fee30e4c241f46e8da2a5ebee674aa57a6 Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Tue, 1 Oct 2024 08:32:22 -0300
Subject: [PATCH 05/39] fluxcd/update-script: add double quotes to prevent
 globbing and word splitting

Eliminates tooling warnings.
---
 pkgs/by-name/fl/fluxcd/update.sh | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/fl/fluxcd/update.sh b/pkgs/by-name/fl/fluxcd/update.sh
index d81089203867..c8cc8901b9f1 100755
--- a/pkgs/by-name/fl/fluxcd/update.sh
+++ b/pkgs/by-name/fl/fluxcd/update.sh
@@ -8,30 +8,30 @@ FLUXCD_PATH="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
 
 OLD_VERSION="$(nix-instantiate --eval -E "with import $NIXPKGS_PATH {}; fluxcd.version or (builtins.parseDrvName fluxcd.name).version" | tr -d '"')"
 LATEST_TAG=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} --silent https://api.github.com/repos/fluxcd/flux2/releases/latest | jq -r '.tag_name')
-LATEST_VERSION=$(echo ${LATEST_TAG} | sed 's/^v//')
+LATEST_VERSION=$(echo "${LATEST_TAG}" | sed 's/^v//')
 
 if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then
-    SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/fluxcd/flux2/archive/refs/tags/${LATEST_TAG}.tar.gz)
-    SHA256=$(nix hash convert --hash-algo sha256 --to sri $SHA256)
-    SPEC_SHA256=$(nix-prefetch-url --quiet --unpack https://github.com/fluxcd/flux2/releases/download/${LATEST_TAG}/manifests.tar.gz)
-    SPEC_SHA256=$(nix hash convert --hash-algo sha256 --to sri $SPEC_SHA256)
+    SHA256=$(nix-prefetch-url --quiet --unpack "https://github.com/fluxcd/flux2/archive/refs/tags/${LATEST_TAG}.tar.gz")
+    SHA256=$(nix hash convert --hash-algo sha256 --to sri "$SHA256")
+    SPEC_SHA256=$(nix-prefetch-url --quiet --unpack "https://github.com/fluxcd/flux2/releases/download/${LATEST_TAG}/manifests.tar.gz")
+    SPEC_SHA256=$(nix hash convert --hash-algo sha256 --to sri "$SPEC_SHA256")
 
     setKV () {
         sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" "${FLUXCD_PATH}/package.nix"
     }
 
-    setKV version ${LATEST_VERSION}
-    setKV sha256 ${SHA256}
-    setKV manifestsSha256 ${SPEC_SHA256}
+    setKV version "${LATEST_VERSION}"
+    setKV sha256 "${SHA256}"
+    setKV manifestsSha256 "${SPEC_SHA256}"
     setKV vendorHash "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" # The same as lib.fakeHash
 
     set +e
-    VENDOR_HASH=$(nix-build --no-out-link -A fluxcd $NIXPKGS_PATH 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g')
-    VENDOR_HASH=$(nix hash convert --hash-algo sha256 --to sri $VENDOR_HASH)
+    VENDOR_HASH=$(nix-build --no-out-link -A fluxcd "$NIXPKGS_PATH" 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g')
+    VENDOR_HASH=$(nix hash convert --hash-algo sha256 --to sri "$VENDOR_HASH")
     set -e
 
     if [ -n "${VENDOR_HASH:-}" ]; then
-        setKV vendorHash ${VENDOR_HASH}
+        setKV vendorHash "${VENDOR_HASH}"
     else
         echo "Update failed. VENDOR_HASH is empty."
         exit 1

From b1332733d4e5c97f6cab8d0ec32cd1fcbab4fb9a Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Tue, 1 Oct 2024 08:24:03 -0300
Subject: [PATCH 06/39] fluxcd: 2.3.0 -> 2.4.0

Release: https://github.com/fluxcd/flux2/releases/tag/v2.4.0
---
 pkgs/by-name/fl/fluxcd/package.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/fl/fluxcd/package.nix b/pkgs/by-name/fl/fluxcd/package.nix
index a1b520e5fe84..3e42a7c7763d 100644
--- a/pkgs/by-name/fl/fluxcd/package.nix
+++ b/pkgs/by-name/fl/fluxcd/package.nix
@@ -8,9 +8,10 @@
 }:
 
 let
-  version = "2.3.0";
-  hash = "sha256-ZQs1rWI31qDo/BgjrmiNnEdR2OL8bUHVz+j5VceEp2k=";
-  manifestsSha256 = "sha256-PdhR+UDquIJWtpSymtT6V7qO5fVJOkFz6RGzAx7xeb4=";
+  version = "2.4.0";
+  hash = "sha256-b4mu/iijfALBm+7OIdKgZs55fR6xWfPgL6OMOgIOi3w=";
+  vendorHash = "sha256-rVyirt6+D1qedbTvPZjLog16sMAq+zyFUmbjnJIieRg=";
+  manifestsSha256 = "sha256-85Ykc6B+DP9PVqwGbvqsQCUHpx/IzIP9TgOt3id7P5g=";
 
   manifests = fetchzip {
     url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";
@@ -21,7 +22,7 @@ in
 
 buildGoModule rec {
   pname = "fluxcd";
-  inherit version;
+  inherit vendorHash version;
 
   src = fetchFromGitHub {
     owner = "fluxcd";
@@ -30,8 +31,6 @@ buildGoModule rec {
     inherit hash;
   };
 
-  vendorHash = "sha256-0YH3pgFrsnh5jIsZpj/sIgfiOCTtIlPltMS5mdGz1eM=";
-
   postUnpack = ''
     cp -r ${manifests} source/cmd/flux/manifests
 

From 477fb8c931d455e2fa3d3e5f235c8414ee33c1d8 Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Tue, 1 Oct 2024 08:49:20 -0300
Subject: [PATCH 07/39] fluxcd: fix update script breakage caused by #341924

---
 pkgs/by-name/fl/fluxcd/package.nix |  8 ++++----
 pkgs/by-name/fl/fluxcd/update.sh   | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/fl/fluxcd/package.nix b/pkgs/by-name/fl/fluxcd/package.nix
index 3e42a7c7763d..89786cf45ea8 100644
--- a/pkgs/by-name/fl/fluxcd/package.nix
+++ b/pkgs/by-name/fl/fluxcd/package.nix
@@ -9,13 +9,13 @@
 
 let
   version = "2.4.0";
-  hash = "sha256-b4mu/iijfALBm+7OIdKgZs55fR6xWfPgL6OMOgIOi3w=";
+  srcHash = "sha256-b4mu/iijfALBm+7OIdKgZs55fR6xWfPgL6OMOgIOi3w=";
   vendorHash = "sha256-rVyirt6+D1qedbTvPZjLog16sMAq+zyFUmbjnJIieRg=";
-  manifestsSha256 = "sha256-85Ykc6B+DP9PVqwGbvqsQCUHpx/IzIP9TgOt3id7P5g=";
+  manifestsHash = "sha256-85Ykc6B+DP9PVqwGbvqsQCUHpx/IzIP9TgOt3id7P5g=";
 
   manifests = fetchzip {
     url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";
-    hash = manifestsSha256;
+    hash = manifestsHash;
     stripRoot = false;
   };
 in
@@ -28,7 +28,7 @@ buildGoModule rec {
     owner = "fluxcd";
     repo = "flux2";
     rev = "v${version}";
-    inherit hash;
+    hash = srcHash;
   };
 
   postUnpack = ''
diff --git a/pkgs/by-name/fl/fluxcd/update.sh b/pkgs/by-name/fl/fluxcd/update.sh
index c8cc8901b9f1..bc229dd6c72e 100755
--- a/pkgs/by-name/fl/fluxcd/update.sh
+++ b/pkgs/by-name/fl/fluxcd/update.sh
@@ -11,23 +11,23 @@ LATEST_TAG=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} --silent https://api
 LATEST_VERSION=$(echo "${LATEST_TAG}" | sed 's/^v//')
 
 if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then
-    SHA256=$(nix-prefetch-url --quiet --unpack "https://github.com/fluxcd/flux2/archive/refs/tags/${LATEST_TAG}.tar.gz")
-    SHA256=$(nix hash convert --hash-algo sha256 --to sri "$SHA256")
-    SPEC_SHA256=$(nix-prefetch-url --quiet --unpack "https://github.com/fluxcd/flux2/releases/download/${LATEST_TAG}/manifests.tar.gz")
-    SPEC_SHA256=$(nix hash convert --hash-algo sha256 --to sri "$SPEC_SHA256")
+    SRC_SHA256=$(nix-prefetch-url --quiet --unpack "https://github.com/fluxcd/flux2/archive/refs/tags/${LATEST_TAG}.tar.gz")
+    SRC_HASH=$(nix hash convert --hash-algo sha256 --to sri "$SRC_SHA256")
+    MANIFESTS_SHA256=$(nix-prefetch-url --quiet --unpack "https://github.com/fluxcd/flux2/releases/download/${LATEST_TAG}/manifests.tar.gz")
+    MANIFESTS_HASH=$(nix hash convert --hash-algo sha256 --to sri "$MANIFESTS_SHA256")
 
     setKV () {
         sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" "${FLUXCD_PATH}/package.nix"
     }
 
     setKV version "${LATEST_VERSION}"
-    setKV sha256 "${SHA256}"
-    setKV manifestsSha256 "${SPEC_SHA256}"
+    setKV srcHash "${SRC_HASH}"
+    setKV manifestsHash "${MANIFESTS_HASH}"
     setKV vendorHash "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=" # The same as lib.fakeHash
 
     set +e
-    VENDOR_HASH=$(nix-build --no-out-link -A fluxcd "$NIXPKGS_PATH" 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g')
-    VENDOR_HASH=$(nix hash convert --hash-algo sha256 --to sri "$VENDOR_HASH")
+    VENDOR_SHA256=$(nix-build --no-out-link -A fluxcd "$NIXPKGS_PATH" 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g')
+    VENDOR_HASH=$(nix hash convert --hash-algo sha256 --to sri "$VENDOR_SHA256")
     set -e
 
     if [ -n "${VENDOR_HASH:-}" ]; then

From 7262ee3118584d8ab1ec57c9f5821df4591f20eb Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 4 Oct 2024 11:04:18 +0200
Subject: [PATCH 08/39] mpich: 4.2.2 -> 4.2.3

---
 pkgs/development/libraries/mpich/default.nix     | 16 ++++++++++++----
 .../libraries/mpich/disable-romio-tests.patch    | 13 +++++++++++++
 2 files changed, 25 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/libraries/mpich/disable-romio-tests.patch

diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix
index 4af559b50758..1e162cb325ea 100644
--- a/pkgs/development/libraries/mpich/default.nix
+++ b/pkgs/development/libraries/mpich/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, perl, gfortran
+{ stdenv, lib, fetchurl, perl, gfortran, automake, autoconf
 , openssh, hwloc, python3
 , darwin
 # either libfabric or ucx work for ch4backend on linux. On darwin, neither of
@@ -21,13 +21,21 @@ assert (ch4backend.pname == "ucx" || ch4backend.pname == "libfabric");
 
 stdenv.mkDerivation  rec {
   pname = "mpich";
-  version = "4.2.2";
+  version = "4.2.3";
 
   src = fetchurl {
     url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz";
-    sha256 = "sha256-iD9bs66r9ifLhJLKAqA7GR0Jg2u+D1mdhQg1EXl4HUE=";
+    hash = "sha256-egGRgMUdFzitnF2NRSMU3mXoKO4kC8stH4DemmW+iKg=";
   };
 
+  patches = [
+    # Disables ROMIO test which was enabled in
+    # https://github.com/pmodels/mpich/commit/09686f45d77b7739f7aef4c2c6ef4c3060946595
+    # The test searches for mpicc in $out/bin, which is not yet present in the checkPhase
+    # Moreover it fails one test.
+    ./disable-romio-tests.patch
+  ];
+
   outputs = [ "out" "doc" "man" ];
 
   configureFlags = [
@@ -42,7 +50,7 @@ stdenv.mkDerivation  rec {
 
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [ gfortran python3 ];
+  nativeBuildInputs = [ gfortran python3 autoconf automake ];
   buildInputs = [ perl openssh hwloc ]
     ++ lib.optional (!stdenv.hostPlatform.isDarwin) ch4backend
     ++ lib.optional pmixSupport pmix
diff --git a/pkgs/development/libraries/mpich/disable-romio-tests.patch b/pkgs/development/libraries/mpich/disable-romio-tests.patch
new file mode 100644
index 000000000000..2a4cd96aee69
--- /dev/null
+++ b/pkgs/development/libraries/mpich/disable-romio-tests.patch
@@ -0,0 +1,13 @@
+diff --git a/src/mpi/romio/Makefile.am b/src/mpi/romio/Makefile.am
+index a6429766f..658f1c563 100644
+--- a/src/mpi/romio/Makefile.am
++++ b/src/mpi/romio/Makefile.am
+@@ -56,7 +56,7 @@ nodist_include_HEADERS += include/mpio.h include/mpiof.h
+ 
+ # ------------------------------------------------------------------------
+ 
+-SUBDIRS = $(external_subdirs) . test
++SUBDIRS = $(external_subdirs)
+ DIST_SUBDIRS = test test-internal $(external_dist_subdirs)
+ 
+ # for the sake of parallel make and avoiding an excessive number of convenience

From f89715531c3ed403e873f292d41e4436747db68e Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 4 Oct 2024 11:33:36 +0200
Subject: [PATCH 09/39] mpich: apply nixfmt

---
 pkgs/development/libraries/mpich/default.nix | 83 +++++++++++++-------
 1 file changed, 56 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix
index 1e162cb325ea..fb929cefa540 100644
--- a/pkgs/development/libraries/mpich/default.nix
+++ b/pkgs/development/libraries/mpich/default.nix
@@ -1,17 +1,29 @@
-{ stdenv, lib, fetchurl, perl, gfortran, automake, autoconf
-, openssh, hwloc, python3
-, darwin
-# either libfabric or ucx work for ch4backend on linux. On darwin, neither of
-# these libraries currently build so this argument is ignored on Darwin.
-, ch4backend
-# Process managers to build (`--with-pm`),
-# cf. https://github.com/pmodels/mpich/blob/b80a6d7c24defe7cdf6c57c52430f8075a0a41d6/README.vin#L562-L586
-, withPm ? [ "hydra" "gforker" ]
-, pmix
-# PMIX support is likely incompatible with process managers (`--with-pm`)
-# https://github.com/NixOS/nixpkgs/pull/274804#discussion_r1432601476
-, pmixSupport ? false
-} :
+{
+  stdenv,
+  lib,
+  fetchurl,
+  perl,
+  gfortran,
+  automake,
+  autoconf,
+  openssh,
+  hwloc,
+  python3,
+  darwin,
+  # either libfabric or ucx work for ch4backend on linux. On darwin, neither of
+  # these libraries currently build so this argument is ignored on Darwin.
+  ch4backend,
+  # Process managers to build (`--with-pm`),
+  # cf. https://github.com/pmodels/mpich/blob/b80a6d7c24defe7cdf6c57c52430f8075a0a41d6/README.vin#L562-L586
+  withPm ? [
+    "hydra"
+    "gforker"
+  ],
+  pmix,
+  # PMIX support is likely incompatible with process managers (`--with-pm`)
+  # https://github.com/NixOS/nixpkgs/pull/274804#discussion_r1432601476
+  pmixSupport ? false,
+}:
 
 let
   withPmStr = if withPm != [ ] then builtins.concatStringsSep ":" withPm else "no";
@@ -19,7 +31,7 @@ in
 
 assert (ch4backend.pname == "ucx" || ch4backend.pname == "libfabric");
 
-stdenv.mkDerivation  rec {
+stdenv.mkDerivation rec {
   pname = "mpich";
   version = "4.2.3";
 
@@ -36,22 +48,39 @@ stdenv.mkDerivation  rec {
     ./disable-romio-tests.patch
   ];
 
-  outputs = [ "out" "doc" "man" ];
-
-  configureFlags = [
-    "--enable-shared"
-    "--with-pm=${withPmStr}"
-  ] ++ lib.optionals (lib.versionAtLeast gfortran.version "10") [
-    "FFLAGS=-fallow-argument-mismatch" # https://github.com/pmodels/mpich/issues/4300
-    "FCFLAGS=-fallow-argument-mismatch"
-  ] ++ lib.optionals pmixSupport [
-    "--with-pmix"
+  outputs = [
+    "out"
+    "doc"
+    "man"
   ];
 
+  configureFlags =
+    [
+      "--enable-shared"
+      "--with-pm=${withPmStr}"
+    ]
+    ++ lib.optionals (lib.versionAtLeast gfortran.version "10") [
+      "FFLAGS=-fallow-argument-mismatch" # https://github.com/pmodels/mpich/issues/4300
+      "FCFLAGS=-fallow-argument-mismatch"
+    ]
+    ++ lib.optionals pmixSupport [
+      "--with-pmix"
+    ];
+
   enableParallelBuilding = true;
 
-  nativeBuildInputs = [ gfortran python3 autoconf automake ];
-  buildInputs = [ perl openssh hwloc ]
+  nativeBuildInputs = [
+    gfortran
+    python3
+    autoconf
+    automake
+  ];
+  buildInputs =
+    [
+      perl
+      openssh
+      hwloc
+    ]
     ++ lib.optional (!stdenv.hostPlatform.isDarwin) ch4backend
     ++ lib.optional pmixSupport pmix
     ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.Foundation;

From 37974f025b3d34ee2158ae28d957adb7501900b3 Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 4 Oct 2024 11:35:39 +0200
Subject: [PATCH 10/39] mpich: remove "with lib" from meta

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

diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix
index fb929cefa540..a01cc726f223 100644
--- a/pkgs/development/libraries/mpich/default.nix
+++ b/pkgs/development/libraries/mpich/default.nix
@@ -95,7 +95,7 @@ stdenv.mkDerivation rec {
     sed -i 's:FC="gfortran":FC=${gfortran}/bin/gfortran:' $out/bin/mpifort
   '';
 
-  meta = with lib; {
+  meta = {
     # As far as we know, --with-pmix silently disables all of `--with-pm`
     broken = pmixSupport && withPm != [ ];
 
@@ -111,7 +111,7 @@ stdenv.mkDerivation rec {
       url = "http://git.mpich.org/mpich.git/blob/a385d6d0d55e83c3709ae851967ce613e892cd21:/COPYRIGHT";
       fullName = "MPICH license (permissive)";
     };
-    maintainers = [ maintainers.markuskowa ];
-    platforms = platforms.linux ++ platforms.darwin;
+    maintainers = [ lib.maintainers.markuskowa ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }

From 22aa7c9845676ec028a6756c4d1a024c724a1489 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 5 Oct 2024 06:13:36 +0000
Subject: [PATCH 11/39] handheld-daemon: 3.3.15 -> 3.4.1

---
 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 9d816c17f61c..286566a2710a 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.15";
+  version = "3.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "hhd-dev";
     repo = "hhd";
     rev = "refs/tags/v${version}";
-    hash = "sha256-NniHOxe77hBHn81pVtlaSeIK+Hp+Lw3xBHolO6Acbho=";
+    hash = "sha256-hup9G4pTlTl68zLzhaDmH7nV8fp/I94Nuis68B8K2wY=";
   };
 
   propagatedBuildInputs = with python3.pkgs; [

From ac9677e56bcbb75b6beb826d901ac9c4a247f610 Mon Sep 17 00:00:00 2001
From: scraptux <git@thomasjasny.de>
Date: Sun, 6 Oct 2024 11:57:09 +0200
Subject: [PATCH 12/39] python312Packages.grpcio-testing: 1.65.4 -> 1.66.2

Diff: grpc/grpc@v1.65.4...v1.66.2

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

diff --git a/pkgs/development/python-modules/grpcio-testing/default.nix b/pkgs/development/python-modules/grpcio-testing/default.nix
index 7e4c7d8b206e..cabad7a8cfbe 100644
--- a/pkgs/development/python-modules/grpcio-testing/default.nix
+++ b/pkgs/development/python-modules/grpcio-testing/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "grpcio-testing";
-  version = "1.65.4";
+  version = "1.66.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "grpcio_testing";
     inherit version;
-    hash = "sha256-iCbY9Ika+NWuBuFqt+FG+8VZTvQZMj4wMW9NDdBnWcY=";
+    hash = "sha256-pje9w7MSutXZKQd2dP0TS0zJbkm0P39OwQVLR28ZRgQ=";
   };
 
   postPatch = ''

From e79165878a7476212a2a6d7d84053953732050fd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Oct 2024 00:34:53 +0000
Subject: [PATCH 13/39] ast-grep: 0.27.3 -> 0.28.0

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

diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix
index 44c90f1e2cfc..0c13cc8cf57e 100644
--- a/pkgs/by-name/as/ast-grep/package.nix
+++ b/pkgs/by-name/as/ast-grep/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ast-grep";
-  version = "0.27.3";
+  version = "0.28.0";
 
   src = fetchFromGitHub {
     owner = "ast-grep";
     repo = "ast-grep";
     rev = version;
-    hash = "sha256-nE4cHQvFseSgB6LluTp9dCDEqR9vAymZCN3V7HgieYA=";
+    hash = "sha256-L0SWDnMMu9OZbgXRuEpVDDamb/hMHVIwLNqog5z26JY=";
   };
 
-  cargoHash = "sha256-A0qvug8wbqN22B0j6BFZyeHMfmlBsuZJRJ1SmctTz1s=";
+  cargoHash = "sha256-gl3GMnWyW3l9tzKaI6xUd6FgCj8u2gtHL9LKgkJLJT4=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From ce6fb6d8b098658017a14aa14d3236051e14cf72 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Oct 2024 02:15:17 +0000
Subject: [PATCH 14/39] fnm: 1.37.1 -> 1.37.2

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

diff --git a/pkgs/development/tools/fnm/default.nix b/pkgs/development/tools/fnm/default.nix
index 145da019b6f6..fe17fdfeff72 100644
--- a/pkgs/development/tools/fnm/default.nix
+++ b/pkgs/development/tools/fnm/default.nix
@@ -10,20 +10,20 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "fnm";
-  version = "1.37.1";
+  version = "1.37.2";
 
   src = fetchFromGitHub {
     owner = "Schniz";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-x6w2g7U/FbJBycMAF4PUyaoIazp/w6imIpy+N7Cf0qk=";
+    sha256 = "sha256-RU9GJIn5yTZU6GsIZVQVMtIXnD9ZjmkLWk/V8ZnSXNY=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ DiskArbitration Foundation Security ];
 
-  cargoHash = "sha256-b15m5DjTDNWJBHOaKSEMwkO/o+0mV+JMBDBurml7xOs=";
+  cargoHash = "sha256-2opSyfEuFTS3QZbrk0SOMeiRc+rQTWvm2vqSHyGeFns=";
 
   doCheck = false;
 

From 06a98b940817bc7c8d0543a7348ca2f7efe457d6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 7 Oct 2024 10:23:35 +0000
Subject: [PATCH 15/39] signal-desktop: 7.26.0 -> 7.27.0

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

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

From 54f231694f8a689881857e5a4e0a70f8ba89ec4c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 8 Oct 2024 21:38:54 +0200
Subject: [PATCH 16/39] =?UTF-8?q?ocamlPackages.elpi:=201.18.1=20=E2=86=92?=
 =?UTF-8?q?=201.20.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/elpi/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/elpi/default.nix b/pkgs/development/ocaml-modules/elpi/default.nix
index f9ee8ca6a193..9afe4ac9182d 100644
--- a/pkgs/development/ocaml-modules/elpi/default.nix
+++ b/pkgs/development/ocaml-modules/elpi/default.nix
@@ -8,7 +8,7 @@
 , ppxlib, ppx_deriving
 , ppxlib_0_15, ppx_deriving_0_15
 , coqPackages
-, version ? if lib.versionAtLeast ocaml.version "4.08" then "1.18.1"
+, version ? if lib.versionAtLeast ocaml.version "4.08" then "1.20.0"
     else "1.15.2"
 }:
 
@@ -16,6 +16,7 @@ let p5 = camlp5; in
 let camlp5 = p5.override { legacy = true; }; in
 
 let fetched = coqPackages.metaFetch ({
+    release."1.20.0".sha256 = "sha256-lctZAIQgOg5d+LfILtWsBVcsemV3zTZYfJfDlCxHtcA=";
     release."1.19.2".sha256 = "sha256-dBj5Ek7PWq/8Btq/dggJUqa8cUtfvbi6EWo/lJEDOU4=";
     release."1.18.1".sha256 = "sha256-rrIv/mVC0Ez3nU7fpnzwduIC3tI6l73DjgAbv1gd2v0=";
     release."1.17.0".sha256 = "sha256-J8FJBeaB+2HtHjrkgNzOZJngZ2AcYU+npL9Y1HNPnzo=";

From 41b90af86c29fbae265de0734b0997d3a6384aea Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 8 Oct 2024 23:22:47 +0200
Subject: [PATCH 17/39] python312Packages.archinfo: 9.2.119 -> 9.2.122

Diff: https://github.com/angr/archinfo/compare/refs/tags/v9.2.119...v9.2.122
---
 pkgs/development/python-modules/archinfo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix
index c1b6e88ed3c5..dfa5d067469b 100644
--- a/pkgs/development/python-modules/archinfo/default.nix
+++ b/pkgs/development/python-modules/archinfo/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "archinfo";
-  version = "9.2.119";
+  version = "9.2.122";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "archinfo";
     rev = "refs/tags/v${version}";
-    hash = "sha256-81vaHTzRCOw8C/KHwFSEMGOWEwpHVK0HicGVi9j4MqU=";
+    hash = "sha256-WmwKpd1c53o/wanvyVPIkXwdwEmKtXvaCa2YIcIsGIU=";
   };
 
   build-system = [ setuptools ];

From 3261166103f12c96a8ad63c232764517f737027b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 8 Oct 2024 23:23:06 +0200
Subject: [PATCH 18/39] python312Packages.ailment: 9.2.119 -> 9.2.122

Diff: https://github.com/angr/ailment/compare/refs/tags/v9.2.119...v9.2.122
---
 pkgs/development/python-modules/ailment/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix
index 25ed8e73ec10..f5d0bcedaee9 100644
--- a/pkgs/development/python-modules/ailment/default.nix
+++ b/pkgs/development/python-modules/ailment/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "ailment";
-  version = "9.2.119";
+  version = "9.2.122";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "ailment";
     rev = "refs/tags/v${version}";
-    hash = "sha256-mVzgwCzCba4xNJMbrDTRRHFUQ48tKihm3VGqpFq6Heo=";
+    hash = "sha256-e+SDgi0bhiE0MdhRxxFlkKU0N5ExfehbEOOyO4+wAzQ=";
   };
 
   build-system = [ setuptools ];

From ac55fc4c8402da309d6a6e5139152b8527d122e0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 8 Oct 2024 23:24:34 +0200
Subject: [PATCH 19/39] python312Packages.pyvex: 9.2.119 -> 9.2.122

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

diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix
index 39f557459674..ec0f4987e6bb 100644
--- a/pkgs/development/python-modules/pyvex/default.nix
+++ b/pkgs/development/python-modules/pyvex/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pyvex";
-  version = "9.2.119";
+  version = "9.2.122";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-c9CaftT7VInEMRsWN7FhDHwXJccma5wkUfiN9EpjUTQ=";
+    hash = "sha256-YfOjjDlu2bkwUGGm0Sk0QfG+uJcezYKjQvditRLYPT8=";
   };
 
   build-system = [ setuptools ];

From 79df04f13a6d81b31b9dccb0b355a2eb56e237b7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 8 Oct 2024 23:25:58 +0200
Subject: [PATCH 20/39] python312Packages.claripy: 9.2.119 -> 9.2.122

Diff: https://github.com/angr/claripy/compare/refs/tags/v9.2.119...v9.2.122
---
 pkgs/development/python-modules/claripy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix
index baaa3200ba31..0f72b2188901 100644
--- a/pkgs/development/python-modules/claripy/default.nix
+++ b/pkgs/development/python-modules/claripy/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "claripy";
-  version = "9.2.119";
+  version = "9.2.122";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "claripy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-dnx5aiZ8ssgC0SFEipYuCXbYbdLt7Ma6xBfN1OlO8Do=";
+    hash = "sha256-UxWPOyrV8Yzzi9TKFlCenP8ZXXjf6sd92naALkqgmkA=";
   };
 
   # z3 does not provide a dist-info, so python-runtime-deps-check will fail

From c7482866ccb3c1b7d181efac70e89b524119fcdd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 8 Oct 2024 23:27:42 +0200
Subject: [PATCH 21/39] python312Packages.cle: 9.2.119 -> 9.2.122

Diff: https://github.com/angr/cle/compare/refs/tags/v9.2.119...v9.2.122
---
 pkgs/development/python-modules/cle/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix
index 554b36650ef3..52ccdb08a9be 100644
--- a/pkgs/development/python-modules/cle/default.nix
+++ b/pkgs/development/python-modules/cle/default.nix
@@ -18,14 +18,14 @@
 
 let
   # The binaries are following the argr projects release cycle
-  version = "9.2.119";
+  version = "9.2.122";
 
   # Binary files from https://github.com/angr/binaries (only used for testing and only here)
   binaries = fetchFromGitHub {
     owner = "angr";
     repo = "binaries";
     rev = "refs/tags/v${version}";
-    hash = "sha256-cIh8ahJGEVzKSylCBVF1RbNftqADjewuiybPiCWfmhw=";
+    hash = "sha256-/TGedNB6JNYjIy0a8yyyZtuUyLEYFJ2CBmvWS/PS1jA=";
   };
 in
 buildPythonPackage rec {
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     owner = "angr";
     repo = "cle";
     rev = "refs/tags/v${version}";
-    hash = "sha256-jOqhwSxdHJsNUZqx/ViPDh09Uk+2hqyxm4p8XwyHZ0k=";
+    hash = "sha256-G/5KYB6np4Y5RTA65WyGvT1I5LyQ2WXJmu5OtXdKmLg=";
   };
 
   build-system = [ setuptools ];

From 24cf465f47706c3db8b7cfa7884d53bb1052f5e1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 9 Oct 2024 00:18:45 +0200
Subject: [PATCH 22/39] python312Packages.coinmetrics-api-client: 2024.8.20.13
 -> 2024.10.4.15

---
 .../python-modules/coinmetrics-api-client/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix
index 81294e45b9fb..bf8f0adbb492 100644
--- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix
+++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "coinmetrics-api-client";
-  version = "2024.8.20.13";
+  version = "2024.10.4.15";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "coinmetrics_api_client";
-    hash = "sha256-IBfHHAmT1BTgA6eMkZf8ggfiknNYp7mfELSRyFARWNk=";
+    hash = "sha256-4Ru614cCTMrAhelkVjDuHo7VcGYqaVeeAfaQkdBZr7k=";
   };
 
   pythonRelaxDeps = [ "typer" ];

From 81417b3f0322997fb771f2f9811d38394a217f3a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Oct 2024 01:53:28 +0000
Subject: [PATCH 23/39] runc: 1.1.14 -> 1.1.15

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

diff --git a/pkgs/applications/virtualization/runc/default.nix b/pkgs/applications/virtualization/runc/default.nix
index ff7fa9f8a3b9..2aaad92eca55 100644
--- a/pkgs/applications/virtualization/runc/default.nix
+++ b/pkgs/applications/virtualization/runc/default.nix
@@ -14,13 +14,13 @@
 
 buildGoModule rec {
   pname = "runc";
-  version = "1.1.14";
+  version = "1.1.15";
 
   src = fetchFromGitHub {
     owner = "opencontainers";
     repo = "runc";
     rev = "v${version}";
-    hash = "sha256-7PYbSZqCQLTaeFppuNz5mxDlwEyLkA5zpdMhWy1tWmc=";
+    hash = "sha256-y8TcMyNRkVfmNkumhohBoyiU6GM8/yLXT/CTFPmXlU4=";
   };
 
   vendorHash = null;

From 9a2c44a943b93f1dc11f6f53a299f94c695f2e4a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Oct 2024 03:09:45 +0000
Subject: [PATCH 24/39] python312Packages.camel-converter: 4.0.0 -> 4.0.1

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

diff --git a/pkgs/development/python-modules/camel-converter/default.nix b/pkgs/development/python-modules/camel-converter/default.nix
index 79ab007d2245..aeaccaee7e21 100644
--- a/pkgs/development/python-modules/camel-converter/default.nix
+++ b/pkgs/development/python-modules/camel-converter/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "camel-converter";
-  version = "4.0.0";
+  version = "4.0.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "sanders41";
     repo = "camel-converter";
     rev = "refs/tags/v${version}";
-    hash = "sha256-JdONlMTBnZ2QMcsr+GXmfQzxaFOndmG77qbBa9A3m+k=";
+    hash = "sha256-cHrMaf5PyFWacoi4t+Clow9qFAxbdn71p8ckuYMt27w=";
   };
 
   build-system = [ hatchling ];

From 039a7c5f50f7800e580e1a06ba283714db2dcb43 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Oct 2024 03:22:31 +0000
Subject: [PATCH 25/39] python312Packages.motionblindsble: 0.1.1 -> 0.1.2

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

diff --git a/pkgs/development/python-modules/motionblindsble/default.nix b/pkgs/development/python-modules/motionblindsble/default.nix
index 0b87622e4c38..81c1964f06fc 100644
--- a/pkgs/development/python-modules/motionblindsble/default.nix
+++ b/pkgs/development/python-modules/motionblindsble/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "motionblindsble";
-  version = "0.1.1";
+  version = "0.1.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "LennP";
     repo = "motionblindsble";
     rev = "refs/tags/${version}";
-    hash = "sha256-GKCSPiwtE3O1vVFzamFkURc+V0w6u19B0vdvkpLY9ZE=";
+    hash = "sha256-MBO8tiGTd5qF7zGp+RkkV8nJHP9TJvk3LdWsZqlsl50=";
   };
 
   postPatch = ''

From 42fc1fc8d675606124e1831a33a22342a6c9d330 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Oct 2024 04:08:25 +0000
Subject: [PATCH 26/39] codux: 15.34.0 -> 15.35.2

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

diff --git a/pkgs/by-name/co/codux/package.nix b/pkgs/by-name/co/codux/package.nix
index 36054e7dc86f..cfb0edb2cfa1 100644
--- a/pkgs/by-name/co/codux/package.nix
+++ b/pkgs/by-name/co/codux/package.nix
@@ -5,11 +5,11 @@
 
 let
   pname = "codux";
-  version = "15.34.0";
+  version = "15.35.2";
 
   src = fetchurl {
     url = "https://github.com/wixplosives/codux-versions/releases/download/${version}/Codux-${version}.x86_64.AppImage";
-    hash = "sha256-/e5tz3/XD/aaxLc/SUrTmWWfqI2Gw/xBTTTSmv5uZEQ=";
+    hash = "sha256-hRfChiVrO+uMPHwPZxN4XYYodXcRbOWZnWKfobBTAXE=";
   };
 
   appimageContents = appimageTools.extractType2 { inherit pname version src; };

From 26ba35b052672d4466b1859537866235612eaabd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Oct 2024 04:27:39 +0000
Subject: [PATCH 27/39] fastddsgen: 4.0.1 -> 4.0.2

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

diff --git a/pkgs/development/tools/fastddsgen/default.nix b/pkgs/development/tools/fastddsgen/default.nix
index 3a04f6c2fd3d..dbabe8cb40fa 100644
--- a/pkgs/development/tools/fastddsgen/default.nix
+++ b/pkgs/development/tools/fastddsgen/default.nix
@@ -8,7 +8,7 @@
 
 let
   pname = "fastddsgen";
-  version = "4.0.1";
+  version = "4.0.2";
 
   gradle = gradle_7;
 
@@ -21,7 +21,7 @@ stdenv.mkDerivation {
     repo = "Fast-DDS-Gen";
     rev = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-6kZndC5v/75FKY78jwmMuFXWpWzxZkCesYK4GLYxUY8=";
+    hash = "sha256-dwShzcS0sCiVZghpjvPYvYu89NNkGWUWPsAzwdzfAqo=";
   };
 
   nativeBuildInputs = [

From ba7d35a1f00c3e0e8f11664f9dc360c82dd7f0b9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Oct 2024 05:08:33 +0000
Subject: [PATCH 28/39] snappymail: 2.38.0 -> 2.38.1

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

diff --git a/pkgs/servers/snappymail/default.nix b/pkgs/servers/snappymail/default.nix
index 254b4aa8d9b9..4860dc51f63c 100644
--- a/pkgs/servers/snappymail/default.nix
+++ b/pkgs/servers/snappymail/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "snappymail";
-  version = "2.38.0";
+  version = "2.38.1";
 
   src = fetchurl {
     url = "https://github.com/the-djmaze/snappymail/releases/download/v${version}/snappymail-${version}.tar.gz";
-    sha256 = "sha256-RoyV/dbhFGyiAV9LB09EIHAbZOiu11KeTeiPJRmFRwE=";
+    sha256 = "sha256-43mmsnK+eBFu+z5DKUxu5NBiS3ktn7uzetg+BHWxSTI=";
   };
 
   sourceRoot = "snappymail";

From dcb2271b8b6ff9350334c69901b937e430acbabd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Oct 2024 05:39:15 +0000
Subject: [PATCH 29/39] redpanda-client: 24.2.5 -> 24.2.6

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

diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix
index 231f6ee216a5..98ff552a3e3c 100644
--- a/pkgs/servers/redpanda/default.nix
+++ b/pkgs/servers/redpanda/default.nix
@@ -6,12 +6,12 @@
 , stdenv
 }:
 let
-  version = "24.2.5";
+  version = "24.2.6";
   src = fetchFromGitHub {
     owner = "redpanda-data";
     repo = "redpanda";
     rev = "v${version}";
-    sha256 = "sha256-25ijVHEcj0AXLxC1rSbp3Xyv+SMQRRkRq+qgRJgSnAI=";
+    sha256 = "sha256-zGVd2jsjhVtNghiBE2BjO28A8+VLvslCBeUpD3vQjcw=";
   };
 in
 buildGoModule rec {

From 3b235d21bef84a85bd312ef236bae8f84daa12dd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Oct 2024 05:51:50 +0000
Subject: [PATCH 30/39] syft: 1.13.0 -> 1.14.0

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

diff --git a/pkgs/by-name/sy/syft/package.nix b/pkgs/by-name/sy/syft/package.nix
index d22a28341aa0..9eb5b2280d2d 100644
--- a/pkgs/by-name/sy/syft/package.nix
+++ b/pkgs/by-name/sy/syft/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "syft";
-  version = "1.13.0";
+  version = "1.14.0";
 
   src = fetchFromGitHub {
     owner = "anchore";
     repo = "syft";
     rev = "refs/tags/v${version}";
-    hash = "sha256-4uANrPYqzyiPoqhTvrpbi0plkbJ3b8HzyYaBmj/hi58=";
+    hash = "sha256-W+KHJM8o0MJeSzWWyESeDXUWeEh2VVnfYm8W40J906k=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -28,7 +28,7 @@ buildGoModule rec {
   # hash mismatch with darwin
   proxyVendor = true;
 
-  vendorHash = "sha256-YM3DgkdappyEg3suV39gbikm/XJ7JqvEYbTF8+no7Qo=";
+  vendorHash = "sha256-j8QCWQcM1xH48B6xxtbXuh2pWTgtRVEIY+KudIKgPjU=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 70c1475e92b1e7dedeb5e9ce5d01992d5c963ef9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christina=20S=C3=B8rensen?= <christina@cafkafk.com>
Date: Wed, 9 Oct 2024 09:50:07 +0200
Subject: [PATCH 31/39] eza: 0.20.1 -> 0.20.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Christina Sørensen <christina@cafkafk.com>
---
 pkgs/by-name/ez/eza/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix
index c24a7eea85a9..0753bf9f8be4 100644
--- a/pkgs/by-name/ez/eza/package.nix
+++ b/pkgs/by-name/ez/eza/package.nix
@@ -17,16 +17,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "eza";
-  version = "0.20.1";
+  version = "0.20.2";
 
   src = fetchFromGitHub {
     owner = "eza-community";
     repo = "eza";
     rev = "v${version}";
-    hash = "sha256-dJrGPxqFfveb7lyCmDU0hnx5TkaDsdJgpKPtWyjj5ls=";
+    hash = "sha256-lit0v9emrAYkHWpCP1Z35UdrKdMiDh2HWeQg4WfxJIo=";
   };
 
-  cargoHash = "sha256-LM+ikA0aiSZmTH5cUcSQ0ikVd9kcADyCOR5qdCD1UJ4=";
+  cargoHash = "sha256-TwUbEeka20K9C8TvJH/Hiv8qp66TjAkcyMG7K2JuagQ=";
 
   nativeBuildInputs = [ cmake pkg-config installShellFiles pandoc ];
   buildInputs = [ zlib ]

From 180386b443aebb2eb9d3bb6a84952940d8143461 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 9 Oct 2024 10:47:58 +0200
Subject: [PATCH 32/39] python312Packages.huggingface-hub: 0.25.1 -> 0.25.2

Diff: https://github.com/huggingface/huggingface_hub/compare/refs/tags/v0.25.1...v0.25.2

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

diff --git a/pkgs/development/python-modules/huggingface-hub/default.nix b/pkgs/development/python-modules/huggingface-hub/default.nix
index 6573cdd1ac89..6d8e4af86d2c 100644
--- a/pkgs/development/python-modules/huggingface-hub/default.nix
+++ b/pkgs/development/python-modules/huggingface-hub/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "huggingface-hub";
-  version = "0.25.1";
+  version = "0.25.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "huggingface_hub";
     rev = "refs/tags/v${version}";
-    hash = "sha256-MloCUtvJ3A7t6NbCCPp4kcR+7apTrIjbvm6Ppe0SgdA=";
+    hash = "sha256-wUZkh8ti35F8bGtEKJZGSRySLvCkIWEFajQNWo/WCys=";
   };
 
   build-system = [ setuptools ];

From 7f63bcba36ecf2442fbe1caaf64255e6d82aa2e7 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Tue, 8 Oct 2024 10:21:05 +0100
Subject: [PATCH 33/39] nixos/nncp: refactor configuration merging

The NNCP utilities have poor support for configuration merging so
use jq and hjson-cli instead.
---
 nixos/modules/programs/nncp.nix | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/programs/nncp.nix b/nixos/modules/programs/nncp.nix
index 3feccef4cf11..6ac0363e50a0 100644
--- a/nixos/modules/programs/nncp.nix
+++ b/nixos/modules/programs/nncp.nix
@@ -74,19 +74,13 @@ in {
       wantedBy = [ "basic.target" ];
       serviceConfig.Type = "oneshot";
       script = ''
-        umask u=rw
-        nncpCfgDir=$(mktemp --directory nncp.XXX)
-        for f in ${jsonCfgFile} ${builtins.toString config.programs.nncp.secrets}; do
-          tmpdir=$(mktemp --directory nncp.XXX)
-          nncp-cfgdir -cfg $f -dump $tmpdir
-          find $tmpdir -size 1c -delete
-          cp -a $tmpdir/* $nncpCfgDir/
-          rm -rf $tmpdir
-        done
-        nncp-cfgdir -load $nncpCfgDir > ${nncpCfgFile}
-        rm -rf $nncpCfgDir
+        umask 127
+        rm -f ${nncpCfgFile}
+        for f in ${jsonCfgFile} ${builtins.toString config.programs.nncp.secrets}
+        do
+          ${lib.getExe pkgs.hjson-go} -c <"$f"
+        done |${lib.getExe pkgs.jq} --slurp add >${nncpCfgFile}
         chgrp ${programCfg.group} ${nncpCfgFile}
-        chmod g+r ${nncpCfgFile}
       '';
     };
   };

From 0ddbc8c69e7455f2c579ccb479a4089684931be7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Oct 2024 09:08:25 +0000
Subject: [PATCH 34/39] vscode: 1.94.0 -> 1.94.1

---
 pkgs/applications/editors/vscode/vscode.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index 7f1b66714364..c6a7eff1d835 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -30,21 +30,21 @@ let
   archive_fmt = if stdenv.hostPlatform.isDarwin then "zip" else "tar.gz";
 
   sha256 = {
-    x86_64-linux = "1adwsm4n934a5z3hnsj9k7mi2l4npl499q8jzk2xhbbpqhkvd96a";
-    x86_64-darwin = "04cvhhxx7s14z5794gn3pwd482cswpqyrmb1qcwm797cz1rz29z5";
-    aarch64-linux = "1fca5rir2bkf4wqrs56qhv3kwrxivx17pa5brxp1k4k8a9jmhy7k";
-    aarch64-darwin = "1mwymizy2a6m9fj3r00h762283fwrkhl9kv5607r0q7widggfg0j";
-    armv7l-linux = "16ndp0mcfb05wfarpq3nxp3bnac1s1yay596mwjmwbwv44qcq40b";
+    x86_64-linux = "11d9qqfb5kh5zsc7xd6h5xsywacir5z08l2snj0cz2cb0nji9xhj";
+    x86_64-darwin = "0rbwvvakh1b5iqca49hcmqlfq4g0j067rrphrh0yx7wdyr6kmwg2";
+    aarch64-linux = "0vrvcy1p5lrdy2lww42w32vr79075vpkwj4q8wfqzd7x72vmhfci";
+    aarch64-darwin = "03wccm854v9va50x91kp00a16r483zpndayhlwy1fm4n0wdy6iw8";
+    armv7l-linux = "0b9r78mz5djvv6n82isn2jqb4bwa41hqyxxc9arhrpvpj5w65rla";
   }.${system} or throwSystem;
 in
   callPackage ./generic.nix rec {
     # Please backport all compatible updates to the stable release.
     # This is important for the extension ecosystem.
-    version = "1.94.0";
+    version = "1.94.1";
     pname = "vscode" + lib.optionalString isInsiders "-insiders";
 
     # This is used for VS Code - Remote SSH test
-    rev = "d78a74bcdfad14d5d3b1b782f87255d802b57511";
+    rev = "e10f2369d0d9614a452462f2e01cdc4aa9486296";
 
     executableName = "code" + lib.optionalString isInsiders "-insiders";
     longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
@@ -68,7 +68,7 @@ in
       src = fetchurl {
         name = "vscode-server-${rev}.tar.gz";
         url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
-        sha256 = "1iqglh4wx4wc80ihzcw4is7hd49s6kxpg9fz357r57a2679q0qw6";
+        sha256 = "094klvp32475f6rsapxkhgsm8cmjmpq4qp3lx2b1vgf3xzl7j9nw";
       };
     };
 

From 1535d725fca3ef238e8c7ae0945b9faf21f27d32 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 9 Oct 2024 10:25:18 +0000
Subject: [PATCH 35/39] blackfire: 2.28.12 -> 2.28.13

---
 pkgs/development/tools/misc/blackfire/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/misc/blackfire/default.nix b/pkgs/development/tools/misc/blackfire/default.nix
index e3114ea8bd3d..af4f83d54bae 100644
--- a/pkgs/development/tools/misc/blackfire/default.nix
+++ b/pkgs/development/tools/misc/blackfire/default.nix
@@ -10,7 +10,7 @@
 
 stdenv.mkDerivation rec {
   pname = "blackfire";
-  version = "2.28.12";
+  version = "2.28.13";
 
   src = passthru.sources.${stdenv.hostPlatform.system} or (throw "Unsupported platform for blackfire: ${stdenv.hostPlatform.system}");
 
@@ -57,23 +57,23 @@ stdenv.mkDerivation rec {
     sources = {
       "x86_64-linux" = fetchurl {
         url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb";
-        sha256 = "Z8E8Nn+q9Onku6K7OM3qh2Co0QYnxn9s+g2/xgntFCw=";
+        sha256 = "cNzmvdsFkDj2W4KG8ZxVY2mfRHTAgq+XOTQtnl3UwvU=";
       };
       "i686-linux" = fetchurl {
         url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb";
-        sha256 = "RbT65OuvjUD73h5qp9n5EIXTPR94T7z6/4EcsE/XMsM=";
+        sha256 = "ZJ2fNJ2W66u0E48wgUO/XlsHSfifhcikb0LG2JncWJ0=";
       };
       "aarch64-linux" = fetchurl {
         url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb";
-        sha256 = "d1VadZt5yZg7AF0UITh3XcEGxBLR6uONgkaLt5vXTE0=";
+        sha256 = "PculxxgMBMpUCsKB2YCQKZ7s8SrT2rIY7La1s8mCQ4g=";
       };
       "aarch64-darwin" = fetchurl {
         url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz";
-        sha256 = "h8IAxVUj85mh8Lz/zpxAHv0r4ozodiFWw+we0b4ZhJo=";
+        sha256 = "FVQrzZr0LBSLmcK8k3QIWQiCk9WMVXOJY2MNW+w/1g8=";
       };
       "x86_64-darwin" = fetchurl {
         url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz";
-        sha256 = "wp5I8urCtH1zr5Pg10yBN5RqVMPmWS/KNd6zSvIslKo=";
+        sha256 = "/MCihH97/W8iMsW10EMdSaj+ZWBigaWDF3GR2WYnh+A=";
       };
     };
 

From 995ee2fa2ca54fb6d46f0a03b9ab4172260c2e3e Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Wed, 9 Oct 2024 12:33:27 +0200
Subject: [PATCH 36/39] nuget-to-nix: add meta.mainProgram

---
 pkgs/build-support/dotnet/nuget-to-nix/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/dotnet/nuget-to-nix/default.nix b/pkgs/build-support/dotnet/nuget-to-nix/default.nix
index 52f5f9906ba1..6a746d30a8ff 100644
--- a/pkgs/build-support/dotnet/nuget-to-nix/default.nix
+++ b/pkgs/build-support/dotnet/nuget-to-nix/default.nix
@@ -28,7 +28,10 @@ runCommandLocal "nuget-to-nix" {
     ];
   };
 
-  meta.description = "Convert a nuget packages directory to a lockfile for buildDotnetModule";
+  meta = {
+    description = "Convert a nuget packages directory to a lockfile for buildDotnetModule";
+    mainProgram = "nuget-to-nix";
+  };
 } ''
   install -Dm755 $script $out/bin/nuget-to-nix
 ''

From 0d71bb909fd1de7cc43377ea7b0f9fa33e225acf Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 8 Oct 2024 18:02:34 +0200
Subject: [PATCH 37/39] python312Packages.tinygrad: patch cuda headers

---
 pkgs/development/python-modules/tinygrad/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/python-modules/tinygrad/default.nix b/pkgs/development/python-modules/tinygrad/default.nix
index 8566c0427112..bb0c6065f0a6 100644
--- a/pkgs/development/python-modules/tinygrad/default.nix
+++ b/pkgs/development/python-modules/tinygrad/default.nix
@@ -74,6 +74,13 @@ buildPythonPackage rec {
       substituteInPlace tinygrad/runtime/ops_clang.py \
         --replace-fail "'clang'" "'${lib.getExe clang}'"
     ''
+    # `cuda_fp16.h` and co. are needed at runtime to compile kernels
+    + lib.optionalString cudaSupport ''
+      substituteInPlace tinygrad/runtime/support/compiler_cuda.py \
+        --replace-fail \
+        ', "-I/usr/local/cuda/include", "-I/usr/include", "-I/opt/cuda/include/"' \
+        ', "-I${lib.getDev cudaPackages.cuda_cudart}/include/"'
+    ''
     + lib.optionalString rocmSupport ''
       substituteInPlace tinygrad/runtime/autogen/hip.py \
         --replace-fail "/opt/rocm/lib/libamdhip64.so" "${rocmPackages.clr}/lib/libamdhip64.so" \

From c2a2f68c8c652372fef1afb4a9d9821f6a2db44f Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 9 Oct 2024 14:09:15 +0300
Subject: [PATCH 38/39] nixosTests.openresty-lua: simplify

There's no point for the intermediate `getPath` function calling
`getLuaPath` with the "lua" argument.
There's also no other nginx test this copies code from.

We always call `getLuaPath` with "lua", so constant-propagate it in.

Also, camel-case `lualibs` to `luaLibs.`
---
 nixos/tests/openresty-lua.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/nixos/tests/openresty-lua.nix b/nixos/tests/openresty-lua.nix
index 9e987398f51d..e3629e9ca40a 100644
--- a/nixos/tests/openresty-lua.nix
+++ b/nixos/tests/openresty-lua.nix
@@ -1,12 +1,11 @@
 import ./make-test-python.nix ({ pkgs, lib, ... }:
   let
-    lualibs = [
+    luaLibs = [
       pkgs.lua.pkgs.markdown
     ];
 
-    getPath = lib: type: "${lib}/share/lua/${pkgs.lua.luaversion}/?.${type}";
-    getLuaPath = lib: getPath lib "lua";
-    luaPath = lib.concatStringsSep ";" (map getLuaPath lualibs);
+    getLuaPath = lib: "${lib}/share/lua/${pkgs.lua.luaversion}/?.lua";
+    luaPath = lib.concatStringsSep ";" (map getLuaPath luaLibs);
   in
   {
     name = "openresty-lua";

From 63669bdb75c392e73ea659af18204afe73a2a48c Mon Sep 17 00:00:00 2001
From: Valentino <65391343+luftmensch-luftmensch@users.noreply.github.com>
Date: Wed, 9 Oct 2024 13:33:25 +0200
Subject: [PATCH 39/39] saucectl: init at 0.183.0 (#336737)

---
 pkgs/by-name/sa/saucectl/package.nix | 37 ++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 pkgs/by-name/sa/saucectl/package.nix

diff --git a/pkgs/by-name/sa/saucectl/package.nix b/pkgs/by-name/sa/saucectl/package.nix
new file mode 100644
index 000000000000..27e05a807c48
--- /dev/null
+++ b/pkgs/by-name/sa/saucectl/package.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+let
+  pname = "saucectl";
+  version = "0.183.0";
+in
+buildGoModule {
+  inherit pname version;
+
+  src = fetchFromGitHub {
+    owner = "saucelabs";
+    repo = "saucectl";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-43X+GBm0pasSSwBB8Q2V8Vr2SjFInHaNMvUNVqD0/pI=";
+  };
+
+  ldflags = [
+    "-X github.com/saucelabs/saucectl/internal/version.Version=${version}"
+    "-X github.com/saucelabs/saucectl/internal/version.GitCommit=${version}"
+  ];
+
+  vendorHash = "sha256-SQveLJzicQSCBwfV3eZyXkArO1wLly1cCvol9PbeEV0=";
+
+  checkFlags = [ "-skip=^TestNewRequestWithContext$" ];
+
+  meta = {
+    description = "Command line interface for the Sauce Labs platform";
+    changelog = "https://github.com/saucelabs/saucectl/releases/tag/v${version}";
+    homepage = "https://github.com/saucelabs/saucectl";
+    license = lib.licenses.apsl20;
+    maintainers = with lib.maintainers; [ luftmensch-luftmensch ];
+    mainProgram = "saucectl";
+  };
+}