From 01e04f8d812426639c2be5d9d5ce7f5a0ab8b63c Mon Sep 17 00:00:00 2001
From: nicoo <nicoo@mur.at>
Date: Mon, 19 Aug 2024 15:10:28 +0000
Subject: [PATCH 01/73] bees: flatten derivation

The `runCommand` wrapper hid the drv's metadata.
---
 pkgs/tools/filesystems/bees/default.nix | 117 +++++++++++-------------
 1 file changed, 54 insertions(+), 63 deletions(-)

diff --git a/pkgs/tools/filesystems/bees/default.nix b/pkgs/tools/filesystems/bees/default.nix
index 1dbb62ccb1b2..a955385c2183 100644
--- a/pkgs/tools/filesystems/bees/default.nix
+++ b/pkgs/tools/filesystems/bees/default.nix
@@ -1,6 +1,5 @@
 { lib
 , stdenv
-, runCommand
 , fetchFromGitHub
 , bash
 , btrfs-progs
@@ -10,73 +9,65 @@
 , nixosTests
 }:
 
-let
+stdenv.mkDerivation rec {
+  pname = "bees";
+  version = "0.10";
 
-  bees = stdenv.mkDerivation rec {
-    pname = "bees";
-    version = "0.10";
-
-    src = fetchFromGitHub {
-      owner = "Zygo";
-      repo = "bees";
-      rev = "v${version}";
-      hash = "sha256-f3P3BEd8uO6QOZ1/2hBzdcuOSggYvHxW3g9pGftKO8g=";
-    };
-
-    buildInputs = [
-      btrfs-progs # for btrfs/ioctl.h
-      util-linux # for uuid.h
-    ];
-
-    nativeBuildInputs = [
-      python3Packages.markdown # documentation build
-    ];
-
-    preBuild = ''
-      git() { if [[ $1 = describe ]]; then echo ${version}; else command git "$@"; fi; }
-      export -f git
-    '';
-
-    postBuild = ''
-      unset -f git
-    '';
-
-    buildFlags = [
-      "ETC_PREFIX=/var/run/bees/configs"
-    ];
-
-    makeFlags = [
-      "SHELL=bash"
-      "PREFIX=$(out)"
-      "ETC_PREFIX=$(out)/etc"
-      "BEES_VERSION=${version}"
-      "SYSTEMD_SYSTEM_UNIT_DIR=$(out)/etc/systemd/system"
-    ];
-
-    meta = with lib; {
-      homepage = "https://github.com/Zygo/bees";
-      description = "Block-oriented BTRFS deduplication service";
-      longDescription = "Best-Effort Extent-Same: bees finds not just identical files, but also identical extents within files that differ";
-      license = licenses.gpl3;
-      platforms = platforms.linux;
-      maintainers = with maintainers; [ chaduffy ];
-    };
+  src = fetchFromGitHub {
+    owner = "Zygo";
+    repo = "bees";
+    rev = "v${version}";
+    hash = "sha256-f3P3BEd8uO6QOZ1/2hBzdcuOSggYvHxW3g9pGftKO8g=";
   };
 
-in
+  buildInputs = [
+    btrfs-progs # for btrfs/ioctl.h
+    util-linux # for uuid.h
+  ];
+
+  nativeBuildInputs = [
+    python3Packages.markdown # documentation build
+  ];
+
+  preBuild = ''
+    git() { if [[ $1 = describe ]]; then echo ${version}; else command git "$@"; fi; }
+    export -f git
+  '';
+
+  postBuild = ''
+    unset -f git
+  '';
+
+  inherit bash bees coreutils;
+  utillinux = util-linux;
+  btrfsProgs = btrfs-progs;
+  postInstall = ''
+    substituteAll ${./bees-service-wrapper} "$out"/bin/bees-service-wrapper
+    chmod +x "$out"/bin/bees-service-wrapper
+  '';
+
+  buildFlags = [
+    "ETC_PREFIX=/var/run/bees/configs"
+  ];
+
+  makeFlags = [
+    "SHELL=bash"
+    "PREFIX=$(out)"
+    "ETC_PREFIX=$(out)/etc"
+    "BEES_VERSION=${version}"
+    "SYSTEMD_SYSTEM_UNIT_DIR=$(out)/etc/systemd/system"
+  ];
 
-(runCommand "bees-service"
-  {
-    inherit bash bees coreutils;
-    utillinux = util-linux; # needs to be a valid shell variable name
-    btrfsProgs = btrfs-progs; # needs to be a valid shell variable name
-  } ''
-  mkdir -p -- "$out/bin"
-  substituteAll ${./bees-service-wrapper} "$out"/bin/bees-service-wrapper
-  chmod +x "$out"/bin/bees-service-wrapper
-  ln -s ${bees}/bin/beesd "$out"/bin/beesd
-'').overrideAttrs {
   passthru.tests = {
     smoke-test = nixosTests.bees;
   };
+
+  meta = with lib; {
+    homepage = "https://github.com/Zygo/bees";
+    description = "Block-oriented BTRFS deduplication service";
+    longDescription = "Best-Effort Extent-Same: bees finds not just identical files, but also identical extents within files that differ";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ chaduffy ];
+  };
 }

From 99e93489ae27439e23004b2f6ec7f560f4b6576d Mon Sep 17 00:00:00 2001
From: nicoo <nicoo@mur.at>
Date: Mon, 19 Aug 2024 15:18:49 +0000
Subject: [PATCH 02/73] =?UTF-8?q?bees:=20substituteAll=20=E2=86=92=20makeW?=
 =?UTF-8?q?rapper?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is tidier, and removes manually-maintained nix-isms from the script.
---
 .../filesystems/bees/bees-service-wrapper     |  4 ---
 pkgs/tools/filesystems/bees/default.nix       | 25 +++++++++++--------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/pkgs/tools/filesystems/bees/bees-service-wrapper b/pkgs/tools/filesystems/bees/bees-service-wrapper
index 67c95e8f8031..ad72c1d95e9d 100755
--- a/pkgs/tools/filesystems/bees/bees-service-wrapper
+++ b/pkgs/tools/filesystems/bees/bees-service-wrapper
@@ -1,7 +1,3 @@
-#!@bash@/bin/bash
-PATH=@bash@/bin:@coreutils@/bin:@utillinux@/bin:@btrfsProgs@/bin:$PATH
-beesd_bin=@bees@/lib/bees/bees
-# PLEASE KEEP NIX-ISMS ABOVE THIS LINE TO EASE UPSTREAM MERGE
 #!/usr/bin/env bash
 
 shopt -s extglob
diff --git a/pkgs/tools/filesystems/bees/default.nix b/pkgs/tools/filesystems/bees/default.nix
index a955385c2183..a014f449079c 100644
--- a/pkgs/tools/filesystems/bees/default.nix
+++ b/pkgs/tools/filesystems/bees/default.nix
@@ -1,12 +1,16 @@
 { lib
-, stdenv
 , fetchFromGitHub
-, bash
-, btrfs-progs
-, coreutils
-, python3Packages
-, util-linux
+, makeWrapper
 , nixosTests
+
+, stdenv
+# Build inputs
+, btrfs-progs
+, util-linux
+, python3Packages
+# bees-service-wrapper
+, bash
+, coreutils
 }:
 
 stdenv.mkDerivation rec {
@@ -26,6 +30,7 @@ stdenv.mkDerivation rec {
   ];
 
   nativeBuildInputs = [
+    makeWrapper
     python3Packages.markdown # documentation build
   ];
 
@@ -38,12 +43,10 @@ stdenv.mkDerivation rec {
     unset -f git
   '';
 
-  inherit bash bees coreutils;
-  utillinux = util-linux;
-  btrfsProgs = btrfs-progs;
   postInstall = ''
-    substituteAll ${./bees-service-wrapper} "$out"/bin/bees-service-wrapper
-    chmod +x "$out"/bin/bees-service-wrapper
+    makeWrapper ${./bees-service-wrapper} "$out"/bin/bees-service-wrapper \
+      --prefix PATH : ${lib.makeBinPath [ bash coreutils util-linux btrfs-progs ]} \
+      --set beesd_bin "$out"/lib/bees/bees
   '';
 
   buildFlags = [

From 1c379e3a57241166b103c5c886104c2316840b7c Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Thu, 22 Aug 2024 17:05:19 +0100
Subject: [PATCH 03/73] buildDotnetModule: add `testFilters` arg

In addition to the existing `disabledTests`, allow defining more general
test filters using `testFilters`.
---
 doc/languages-frameworks/dotnet.section.md                | 1 +
 pkgs/build-support/dotnet/build-dotnet-module/default.nix | 6 ++++++
 .../dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh | 8 +++++++-
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/doc/languages-frameworks/dotnet.section.md b/doc/languages-frameworks/dotnet.section.md
index 546b451f3117..cdacec1c3a5e 100644
--- a/doc/languages-frameworks/dotnet.section.md
+++ b/doc/languages-frameworks/dotnet.section.md
@@ -118,6 +118,7 @@ For more detail about managing the `deps.nix` file, see [Generating and updating
 * `dotnet-sdk` is useful in cases where you need to change what dotnet SDK is being used. You can also set this to the result of `dotnetSdkPackages.combinePackages`, if the project uses multiple SDKs to build.
 * `dotnet-runtime` is useful in cases where you need to change what dotnet runtime is being used. This can be either a regular dotnet runtime, or an aspnetcore.
 * `testProjectFile` is useful in cases where the regular project file does not contain the unit tests. It gets restored and build, but not installed. You may need to regenerate your nuget lockfile after setting this. Note that if set, only tests from this project are executed.
+* `testFilters` is used to disable running unit tests based on various [filters](https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-test#filter-option-details). This gets passed as: `dotnet test --filter "{}"`, with each filter being concatenated using `"&"`.
 * `disabledTests` is used to disable running specific unit tests. This gets passed as: `dotnet test --filter "FullyQualifiedName!={}"`, to ensure compatibility with all unit test frameworks.
 * `dotnetRestoreFlags` can be used to pass flags to `dotnet restore`.
 * `dotnetBuildFlags` can be used to pass flags to `dotnet build`.
diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix
index c8ad6a174ce5..418c90c64899 100644
--- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix
+++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix
@@ -67,7 +67,12 @@ let
       # platforms in meta.platforms which are supported by the sdk.
       runtimeId ? null,
 
+      # Test filters. This gets passed to `dotnet test --filter`, concatenated using `&`.
+      # You may also use `disabledTests` to filter tests based on their name.
+      # See https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-test#filter-option-details for more details.
+      testFilters ? [ ],
       # Tests to disable. This gets passed to `dotnet test --filter "FullyQualifiedName!={}"`, to ensure compatibility with all frameworks.
+      # You may also use `testFilters` to pass more generic filters to `dotnet test --filter`.
       # See https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-test#filter-option-details for more details.
       disabledTests ? [ ],
       # The project file to run unit tests against. This is usually referenced in the regular project file, but sometimes it needs to be manually set.
@@ -132,6 +137,7 @@ let
       dotnetBuildType = buildType;
       dotnetProjectFiles = projectFiles;
       dotnetTestProjectFiles = testProjectFiles;
+      dotnetTestFilters = testFilters;
       dotnetDisabledTests = disabledTests;
       dotnetRuntimeIds = lib.singleton (
         if runtimeId != null then runtimeId else systemToDotnetRid stdenvNoCC.hostPlatform.system
diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh
index 4dc8b5a97a1f..21ebbbe5381e 100644
--- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh
+++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-check-hook.sh
@@ -9,6 +9,7 @@ dotnetCheckHook() {
         local dotnetProjectFilesArray=( "${dotnetProjectFiles[@]}" )
         local dotnetTestProjectFilesArray=( "${dotnetTestProjectFiles[@]}" )
         local dotnetTestFlagsArray=( "${dotnetTestFlags[@]}" )
+        local dotnetTestFiltersArray=( "${dotnetTestFilters[@]}" )
         local dotnetDisabledTestsArray=( "${dotnetDisabledTests[@]}" )
         local dotnetRuntimeDepsArray=( "${dotnetRuntimeDeps[@]}" )
         local dotnetRuntimeIdsArray=( "${dotnetRuntimeIds[@]}" )
@@ -16,6 +17,7 @@ dotnetCheckHook() {
         local dotnetProjectFilesArray=($dotnetProjectFiles)
         local dotnetTestProjectFilesArray=($dotnetTestProjectFiles)
         local dotnetTestFlagsArray=($dotnetTestFlags)
+        local dotnetTestFiltersArray=($dotnetTestFilters)
         local dotnetDisabledTestsArray=($dotnetDisabledTests)
         local dotnetRuntimeDepsArray=($dotnetRuntimeDeps)
         local dotnetRuntimeIdsArray=($dotnetRuntimeIds)
@@ -23,8 +25,12 @@ dotnetCheckHook() {
 
     if (( ${#dotnetDisabledTestsArray[@]} > 0 )); then
         local disabledTestsFilters=("${dotnetDisabledTestsArray[@]/#/FullyQualifiedName!=}")
+        dotnetTestFiltersArray=( "${dotnetTestFiltersArray[@]}" "${disabledTestsFilters[@]//,/%2C}" )
+    fi
+
+    if (( ${#dotnetTestFiltersArray[@]} > 0 )); then
         local OLDIFS="$IFS" IFS='&'
-        dotnetTestFlagsArray+=("--filter:${disabledTestsFilters[*]//,/%2C}")
+        dotnetTestFlagsArray+=("--filter:${dotnetTestFiltersArray[*]}")
         IFS="$OLDIFS"
     fi
 

From a177c637b91c7d40531327a04dfdc3e1035d293b Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Thu, 22 Aug 2024 17:08:39 +0100
Subject: [PATCH 04/73] nexusmods-app: use `testFilters` & `disabledTests` args

---
 pkgs/by-name/ne/nexusmods-app/package.nix | 32 +++++++++++------------
 1 file changed, 15 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix
index 875f17e876bb..f8d49ce1660b 100644
--- a/pkgs/by-name/ne/nexusmods-app/package.nix
+++ b/pkgs/by-name/ne/nexusmods-app/package.nix
@@ -69,25 +69,23 @@ buildDotnetModule rec {
 
   doCheck = true;
 
-  dotnetTestFlags = [
-    "--environment=USER=nobody"
-    (
-      "--filter="
-      + lib.strings.concatStringsSep "&" (
-        [
-          "Category!=Disabled"
-          "FlakeyTest!=True"
-          "RequiresNetworking!=True"
-          "FullyQualifiedName!=NexusMods.UI.Tests.ImageCacheTests.Test_LoadAndCache_RemoteImage"
-          "FullyQualifiedName!=NexusMods.UI.Tests.ImageCacheTests.Test_LoadAndCache_ImageStoredFile"
-        ]
-        ++ lib.optionals (!_7zz.meta.unfree) [
-          "FullyQualifiedName!=NexusMods.Games.FOMOD.Tests.FomodXmlInstallerTests.InstallsFilesSimple_UsingRar"
-        ]
-      )
-    )
+  dotnetTestFlags = [ "--environment=USER=nobody" ];
+
+  testFilters = [
+    "Category!=Disabled"
+    "FlakeyTest!=True"
+    "RequiresNetworking!=True"
   ];
 
+  disabledTests =
+    [
+      "NexusMods.UI.Tests.ImageCacheTests.Test_LoadAndCache_RemoteImage"
+      "NexusMods.UI.Tests.ImageCacheTests.Test_LoadAndCache_ImageStoredFile"
+    ]
+    ++ lib.optionals (!_7zz.meta.unfree) [
+      "NexusMods.Games.FOMOD.Tests.FomodXmlInstallerTests.InstallsFilesSimple_UsingRar"
+    ];
+
   passthru = {
     tests =
       let

From b11061581dba23674d65789b737816cc53017d38 Mon Sep 17 00:00:00 2001
From: Dovydas Kersys <dovydas@kersys.lt>
Date: Sat, 24 Aug 2024 00:59:39 +0300
Subject: [PATCH 05/73] apple-cursor: 2.0.0 -> 2.0.1

---
 pkgs/data/icons/apple-cursor/default.nix | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/pkgs/data/icons/apple-cursor/default.nix b/pkgs/data/icons/apple-cursor/default.nix
index 5db50d0fbbe8..b8bc15a2bf57 100644
--- a/pkgs/data/icons/apple-cursor/default.nix
+++ b/pkgs/data/icons/apple-cursor/default.nix
@@ -8,19 +8,12 @@ let
     name = variant;
     url = "https://github.com/ful1e5/apple_cursor/releases/download/v${version}/${variant}.${suffix}";
     hash = hash;
-  } // (lib.optionalAttrs (suffix == "zip") { stripRoot = false; }));
+  } // (lib.optionalAttrs (suffix == "zip") { stripRoot = false; }) // (lib.optionalAttrs (suffix == "tar.xz") { stripRoot = false; }));
 
-  version = "2.0.0";
   srcs = [
-    (_src "macOS-BigSur-White" "tar.gz" "sha256-3Ax2hMfkEL4cyJtGQpK3PqC/L5wtmgO0LsY4gkTQ2Bg=")
-    (_src "macOS-BigSur-White-Windows" "zip" "sha256-V6J2Ddgq46BkgxCWVReZrvE7CsOczzV7slOpilKFG9E=")
-    (_src "macOS-BigSur" "tar.gz" "sha256-VZWFf1AHum2xDJPMZrBmcyVrrmYGKwCdXOPATw7myOA=")
-    (_src "macOS-BigSur-Windows" "zip" "sha256-lp28ACsK8BXe6rSDELL4GdXb1QEdOVC8Y6eLofctkR4=")
-    (_src "macOS-Monterey-White" "tar.gz" "sha256-IfFYUbDW6mBe209iU1sBhFzolZd6YDVdJf+DPe9AQDM=")
-    (_src "macOS-Monterey-White-Windows" "zip" "sha256-gUuBFOi0nDBoX9TWPg4eQhCAhwYeEhfDEbYpc+XsQNE=")
-    (_src "macOS-Monterey" "tar.gz" "sha256-MHmaZs56Q1NbjkecvfcG1zAW85BCZDn5kXmxqVzPc7M=")
-    (_src "macOS-Monterey-Windows" "zip" "sha256-ajxEgq7besaRajLn0gTPpp4euOWVqbzc78u720PWlyE=")
+    (_src "macOS" "tar.xz" "sha256-nS4g+VwM+4q/S1ODb3ySi2SBk7Ha8vF8d9XpP5cEkok=")
   ];
+  version = "2.0.1";
 in stdenv.mkDerivation rec {
   pname = "apple_cursor";
   inherit version;
@@ -30,7 +23,7 @@ in stdenv.mkDerivation rec {
 
   installPhase = ''
     install -dm 0755 $out/share/icons
-    cp -r macOS* $out/share/icons/
+    cp -r macOS/macOS* $out/share/icons/
   '';
 
   meta = with lib; {

From a20c12ad89b45e3585fcbfe1eed767cf252c0766 Mon Sep 17 00:00:00 2001
From: Dovydas Kersys <dovydas@kersys.lt>
Date: Sat, 24 Aug 2024 01:12:07 +0300
Subject: [PATCH 06/73] maintainers: add dxwil

---
 maintainers/maintainer-list.nix          | 6 ++++++
 pkgs/data/icons/apple-cursor/default.nix | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 349b6d2a9f3f..9ca35626562f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5630,6 +5630,12 @@
     githubId = 6689924;
     name = "David Terry";
   };
+  dxwil = {
+    email = "dovydas@kersys.lt";
+    github = "dxwil";
+    githubId = 90563298;
+    name = "Dovydas Kersys";
+  };
   dylan-gonzalez = {
     email = "dylcg10@gmail.com";
     github = "dylan-gonzalez";
diff --git a/pkgs/data/icons/apple-cursor/default.nix b/pkgs/data/icons/apple-cursor/default.nix
index b8bc15a2bf57..81643854fc42 100644
--- a/pkgs/data/icons/apple-cursor/default.nix
+++ b/pkgs/data/icons/apple-cursor/default.nix
@@ -31,6 +31,6 @@ in stdenv.mkDerivation rec {
     homepage = "https://github.com/ful1e5/apple_cursor";
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ colemickens ];
+    maintainers = with maintainers; [ colemickens dxwil ];
   };
 }

From d15cef1e2f8578936493798e2af5cda42972ede0 Mon Sep 17 00:00:00 2001
From: Kaleo <kaleocheng@gmail.com>
Date: Sat, 24 Aug 2024 11:31:16 +0800
Subject: [PATCH 07/73] dropbox: 185.4.6054 -> 206.3.6386

---
 pkgs/applications/networking/dropbox/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index e785bdccd2bc..3026fd84e9f4 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -7,7 +7,7 @@ assert lib.elem stdenv.hostPlatform.system platforms;
 # Dropbox client to bootstrap installation.
 # The client is self-updating, so the actual version may be newer.
 let
-  version = "185.4.6054";
+  version = "206.3.6386";
 
   arch = {
     x86_64-linux = "x86_64";

From b2978adff4486e5ec2d4fa34fb650a8b95f71dc6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 24 Aug 2024 17:51:20 +0000
Subject: [PATCH 08/73] quisk: 4.2.35 -> 4.2.37

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

diff --git a/pkgs/applications/radio/quisk/default.nix b/pkgs/applications/radio/quisk/default.nix
index e31c5ea369b0..fb92350a4bba 100644
--- a/pkgs/applications/radio/quisk/default.nix
+++ b/pkgs/applications/radio/quisk/default.nix
@@ -8,11 +8,11 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "quisk";
-  version = "4.2.35";
+  version = "4.2.37";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-2QCFUV7FpNiqGPHLXAMHJcnCn9FOk1mx12P9ZDtvVvg=";
+    hash = "sha256-S25pqHZUZp9yucVaYAQv7Pa/N1gKU4Sc9nPS7/AplqY=";
   };
 
   buildInputs = [

From 35e5fab91dbcd98df3d319e9ba1d88807285a2e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Sat, 24 Aug 2024 16:04:38 -0300
Subject: [PATCH 09/73] lxtask: fetch from the github repository

---
 pkgs/desktops/lxde/core/lxtask/default.nix | 28 +++++++++++++++-------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/pkgs/desktops/lxde/core/lxtask/default.nix b/pkgs/desktops/lxde/core/lxtask/default.nix
index 2daece75cbd4..555ecca7b030 100644
--- a/pkgs/desktops/lxde/core/lxtask/default.nix
+++ b/pkgs/desktops/lxde/core/lxtask/default.nix
@@ -1,29 +1,39 @@
 { lib
 , stdenv
-, fetchurl
-, pkg-config
-, intltool
+, fetchFromGitHub
+, autoreconfHook
 , gtk3
+, intltool
 , libintl
+, pkg-config
 }:
 
 stdenv.mkDerivation rec {
   pname = "lxtask";
   version = "0.1.10";
 
-  src = fetchurl {
-    url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz";
-    sha256 = "0b2fxg8jjjpk219gh7qa18g45365598nd2bq7rrq0bdvqjdxy5i2";
+  src = fetchFromGitHub {
+    owner = "lxde";
+    repo = "lxtask";
+    rev = version;
+    hash = "sha256-8NCtcEioyaRs4bTWjv0NLu6+kgP/Z68baV2v+oW9hdo=";
   };
 
-  nativeBuildInputs = [ pkg-config intltool ];
+  nativeBuildInputs = [
+    autoreconfHook
+    intltool
+    pkg-config
+  ];
 
-  buildInputs = [ gtk3 libintl ];
+  buildInputs = [
+    gtk3
+    libintl
+  ];
 
   configureFlags = [ "--enable-gtk3" ];
 
   meta = with lib; {
-    homepage = "https://wiki.lxde.org/en/LXTask";
+    homepage = "http://lxde.sourceforge.net/";
     description = "Lightweight and desktop independent task manager";
     mainProgram = "lxtask";
     longDescription = ''

From d881cf7d62ded69b494df997b522e4801dccee12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Sat, 24 Aug 2024 16:28:50 -0300
Subject: [PATCH 10/73] lxtask: add update script

---
 pkgs/desktops/lxde/core/lxtask/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/desktops/lxde/core/lxtask/default.nix b/pkgs/desktops/lxde/core/lxtask/default.nix
index 555ecca7b030..004d1986fb05 100644
--- a/pkgs/desktops/lxde/core/lxtask/default.nix
+++ b/pkgs/desktops/lxde/core/lxtask/default.nix
@@ -6,6 +6,7 @@
 , intltool
 , libintl
 , pkg-config
+, gitUpdater
 }:
 
 stdenv.mkDerivation rec {
@@ -32,6 +33,8 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--enable-gtk3" ];
 
+  passthru.updateScript = gitUpdater { };
+
   meta = with lib; {
     homepage = "http://lxde.sourceforge.net/";
     description = "Lightweight and desktop independent task manager";

From 576d12cf79ddde36df6fcc338f7d670bb99a4617 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Sat, 24 Aug 2024 16:30:53 -0300
Subject: [PATCH 11/73] lxtask: 0.1.10 -> 0.1.11

---
 pkgs/desktops/lxde/core/lxtask/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxde/core/lxtask/default.nix b/pkgs/desktops/lxde/core/lxtask/default.nix
index 004d1986fb05..b29581dfe5fa 100644
--- a/pkgs/desktops/lxde/core/lxtask/default.nix
+++ b/pkgs/desktops/lxde/core/lxtask/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxtask";
-  version = "0.1.10";
+  version = "0.1.11";
 
   src = fetchFromGitHub {
     owner = "lxde";
     repo = "lxtask";
     rev = version;
-    hash = "sha256-8NCtcEioyaRs4bTWjv0NLu6+kgP/Z68baV2v+oW9hdo=";
+    hash = "sha256-KPne7eWzOOSZjHlam3e6HifNk2Sx1vWnQYkXDFZGop0=";
   };
 
   nativeBuildInputs = [

From 7c00ac89dceca60c0441d75b868c2813a7ef3133 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 27 Aug 2024 14:23:52 +0000
Subject: [PATCH 12/73] python312Packages.nbdev: 2.3.27 -> 2.3.28

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

diff --git a/pkgs/development/python-modules/nbdev/default.nix b/pkgs/development/python-modules/nbdev/default.nix
index 130ab24cbb8d..023cf92090bc 100644
--- a/pkgs/development/python-modules/nbdev/default.nix
+++ b/pkgs/development/python-modules/nbdev/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "nbdev";
-  version = "2.3.27";
+  version = "2.3.28";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-vF79mY5dy00xfaGR8L9HPpdxOiEpiJ1AQt42hO9DIMs=";
+    hash = "sha256-BTZFcX7/mPDgahK9K2WiVQUWK5lFhtH4f4IilgIIwgw=";
   };
 
 

From 230fed8ac54b6f7a385361777f90d26f01c639be Mon Sep 17 00:00:00 2001
From: bl0v3 <flan@d.re>
Date: Wed, 28 Aug 2024 08:52:47 +0000
Subject: [PATCH 13/73] openblas: Enable s390x-linux

---
 .../libraries/science/math/openblas/default.nix            | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix
index e36c92d60b67..43e3f73bc606 100644
--- a/pkgs/development/libraries/science/math/openblas/default.nix
+++ b/pkgs/development/libraries/science/math/openblas/default.nix
@@ -114,6 +114,13 @@ let
       DYNAMIC_ARCH = setDynamicArch false;
       USE_OPENMP = true;
     };
+
+    s390x-linux = {
+      BINARY = 64;
+      TARGET = setTarget "ZARCH_GENERIC";
+      DYNAMIC_ARCH = setDynamicArch true;
+      USE_OPENMP = true;
+    };
   };
 in
 

From 04130d9b5e0e585b3c8aa500ae7ebaeee018cc6c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 30 Aug 2024 03:19:16 +0000
Subject: [PATCH 14/73] vault: 1.17.3 -> 1.17.4

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

diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix
index 8e259dc20cba..54446d5d1061 100644
--- a/pkgs/tools/security/vault/default.nix
+++ b/pkgs/tools/security/vault/default.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "vault";
-  version = "1.17.3";
+  version = "1.17.4";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "vault";
     rev = "v${version}";
-    hash = "sha256-N5nJBMRaHzK7aMPSeLVmnItf3CuGeblDMsGLDEz8HZc=";
+    hash = "sha256-4/oUL4VF7zN77/0BXVcj3foNXiK/IqN33p5/XEEk5ZM=";
   };
 
-  vendorHash = "sha256-yy6bk86o/Q8KgggVJd8VCErG1txNbGsEuozyDa6IrCA=";
+  vendorHash = "sha256-MJPKICuaxyUA8DQsdeToJK7HQk1VINNjv7JGjb1mrCs=";
 
   proxyVendor = true;
 

From 71334dce17bdee772c2863275cd249ee67155404 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 30 Aug 2024 05:26:28 +0000
Subject: [PATCH 15/73] pantheon.elementary-settings-daemon: 8.0.0 -> 8.1.0

---
 .../pantheon/services/elementary-settings-daemon/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
index d2780cdcfe65..744c546987b5 100644
--- a/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
+++ b/pkgs/desktops/pantheon/services/elementary-settings-daemon/default.nix
@@ -25,13 +25,13 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-settings-daemon";
-  version = "8.0.0";
+  version = "8.1.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "settings-daemon";
     rev = version;
-    sha256 = "sha256-e70OVdvyKzzF+W7epzj23/Q1lsJiSJd7z1fj41sWfWU=";
+    sha256 = "sha256-w5dRQPRsM52wqusTLLPmKmVwoBFS+pHOokfDmCDxVWM=";
   };
 
   nativeBuildInputs = [

From a606bee95505f55e5ee0f5b864eae2f0eda040d7 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Sat, 31 Aug 2024 10:03:24 +0530
Subject: [PATCH 16/73] svt-av1-psy: init at 2.2.1

---
 pkgs/by-name/sv/svt-av1-psy/package.nix | 55 +++++++++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 pkgs/by-name/sv/svt-av1-psy/package.nix

diff --git a/pkgs/by-name/sv/svt-av1-psy/package.nix b/pkgs/by-name/sv/svt-av1-psy/package.nix
new file mode 100644
index 000000000000..df45ea1734cc
--- /dev/null
+++ b/pkgs/by-name/sv/svt-av1-psy/package.nix
@@ -0,0 +1,55 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  nasm,
+  libdovi,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "svt-av1-psy";
+  version = "2.2.1";
+
+  src = fetchFromGitHub {
+    owner = "gianni-rosato";
+    repo = "svt-av1-psy";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-4ds7yrUMp0O5/aWOkdnrANR1D3djajU/0ZeY6xJnpHI=";
+  };
+
+  cmakeBuildType = "Release";
+
+  cmakeFlags = lib.mapAttrsToList lib.cmakeFeature {
+    LIBDOVI_FOUND = lib.boolToString true;
+    # enable when libhdr10plus is available
+    # LIBHDR10PLUS_RS_FOUND = lib.boolToString true;
+  };
+
+  nativeBuildInputs = [
+    cmake
+    nasm
+  ];
+
+  buildInputs = [
+    libdovi
+  ];
+
+  meta = {
+    homepage = "https://github.com/gianni-rosato/svt-av1-psy";
+    description = "Scalable Video Technology AV1 Encoder and Decoder";
+
+    longDescription = ''
+      SVT-AV1-PSY is the Scalable Video Technology for AV1 (SVT-AV1 Encoder and Decoder)
+      with perceptual enhancements for psychovisually optimal AV1 encoding.
+      The goal is to create the best encoding implementation for perceptual quality with AV1.
+    '';
+
+    license = with lib.licenses; [
+      aom
+      bsd3
+    ];
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ johnrtitor ];
+  };
+})

From 2137cfedcb572b8613ea03f979134ec87383468c Mon Sep 17 00:00:00 2001
From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com>
Date: Sat, 31 Aug 2024 12:55:27 +0300
Subject: [PATCH 17/73] koboldcpp-1.73.1 -> koboldcpp-1.74

Changelog: https://github.com/LostRuins/koboldcpp/releases/tag/v1.74
Diff: https://github.com/LostRuins/koboldcpp/compare/v1.73.1...v1.74
---
 pkgs/by-name/ko/koboldcpp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix
index 124cdbebd470..6b4a942fd484 100644
--- a/pkgs/by-name/ko/koboldcpp/package.nix
+++ b/pkgs/by-name/ko/koboldcpp/package.nix
@@ -53,13 +53,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "koboldcpp";
-  version = "1.73.1";
+  version = "1.74";
 
   src = fetchFromGitHub {
     owner = "LostRuins";
     repo = "koboldcpp";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-LRXtmQ5u+/vgcU6YC9IN2CazfDtg5+jZnJV2o9jEAaY=";
+    hash = "sha256-tGG1+EGlCUmFpx/axijonOXydurwFxqjuoeDwHxC+pc=";
   };
 
   enableParallelBuilding = true;

From 9bd70468baf00273e9178f8c76d612ca74ba2e3d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 31 Aug 2024 12:00:24 +0000
Subject: [PATCH 18/73] cargo-update: 14.0.2 -> 14.1.1

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

diff --git a/pkgs/development/tools/rust/cargo-update/default.nix b/pkgs/development/tools/rust/cargo-update/default.nix
index b0210e5187d7..f2aa80920811 100644
--- a/pkgs/development/tools/rust/cargo-update/default.nix
+++ b/pkgs/development/tools/rust/cargo-update/default.nix
@@ -16,14 +16,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-update";
-  version = "14.0.2";
+  version = "14.1.1";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-5fNypt1zezBWmt0eLDGxL7PmRUSuzQ3s4Aymz9ZMXT0=";
+    hash = "sha256-2UV+BetL6MBHAyPcMTbssLNgJQKoJOo2iG3uGPWSrUs=";
   };
 
-  cargoHash = "sha256-NKo3Ry2bok7jxblrHjFJB24FFm62zclCxae+SxoYQqc=";
+  cargoHash = "sha256-Qn2DquO3HmhZvCk6FaowodgURvtA5gXrztN+wp60bSA=";
 
   nativeBuildInputs = [
     cmake

From 3af5158353847323fe2f17484d8849af9a93f198 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Sat, 31 Aug 2024 17:30:07 +0200
Subject: [PATCH 19/73] devilutionx: 1.5.2 -> 1.5.3

---
 pkgs/games/devilutionx/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/games/devilutionx/default.nix b/pkgs/games/devilutionx/default.nix
index 9168a34253b9..e26a77e57a09 100644
--- a/pkgs/games/devilutionx/default.nix
+++ b/pkgs/games/devilutionx/default.nix
@@ -21,8 +21,8 @@ let
 
   # fork with patches, far behind upstream
   asio = fetchurl {
-    url = "https://github.com/diasurgical/asio/archive/bd1c839ef741b14365e77964bdd5a78994c05934.tar.gz";
-    sha256 = "sha256-ePcdyvOfO5tyPVP+8t3+cS/XeEp47lfaE8gERRVoJSM=";
+    url = "https://github.com/diasurgical/asio/archive/4bcf552fcea3e1ae555dde2ab33bc9fa6770da4d.tar.gz";
+    sha256 = "sha256-AFBy5OFsAzxZsiI4DirIHh+VjFkdalEhN9OGqhC0Cvc=";
   };
 
   # fork with patches, upstream seems to be dead
@@ -67,13 +67,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "devilutionx";
-  version = "1.5.2";
+  version = "1.5.3";
 
   src = fetchFromGitHub {
     owner = "diasurgical";
     repo = "devilutionX";
     rev = version;
-    sha256 = "sha256-XILPpIYSC0+CbhyVXCNvAknAhqU7VW1dWZCh2BapQjs=";
+    sha256 = "sha256-4cA2OHTc51U8XIk3iS16En7JJExkcn4a4VdtjNkZfH8=";
   };
 
   postPatch = ''

From 3ed98a38f1b6a55a719a90b410810192496057e9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Sep 2024 04:37:57 +0000
Subject: [PATCH 20/73] mapproxy: 2.2.0 -> 3.0.1

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

diff --git a/pkgs/servers/geospatial/mapproxy/default.nix b/pkgs/servers/geospatial/mapproxy/default.nix
index b27797883e0d..ccd193453093 100644
--- a/pkgs/servers/geospatial/mapproxy/default.nix
+++ b/pkgs/servers/geospatial/mapproxy/default.nix
@@ -6,10 +6,10 @@
 with python3.pkgs;
 buildPythonApplication rec {
   pname = "MapProxy";
-  version = "2.2.0";
+  version = "3.0.1";
   src = fetchPypi {
   inherit pname version;
-  hash = "sha256-2FEgfdo8i/R5lU0G514zJcaIRe8y60Vm0jHOBEaoEwI=";
+  hash = "sha256-2So0e5VDWde33bNksdhzdaiOp4XkHcyULeBifV5OtKM=";
   };
   prePatch = ''
     substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv"

From dc4cf9eb9d1d84523da0bff6d4033b19212a8263 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Sep 2024 07:07:23 +0000
Subject: [PATCH 21/73] chirp: 0.4.0-unstable-2024-08-06 ->
 0.4.0-unstable-2024-08-31

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

diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/applications/radio/chirp/default.nix
index 4734ad5efdf3..934b96e2ba85 100644
--- a/pkgs/applications/radio/chirp/default.nix
+++ b/pkgs/applications/radio/chirp/default.nix
@@ -10,13 +10,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "chirp";
-  version = "0.4.0-unstable-2024-08-06";
+  version = "0.4.0-unstable-2024-08-31";
 
   src = fetchFromGitHub {
     owner = "kk7ds";
     repo = "chirp";
-    rev = "a8242df7d2bfc888604e26b9dc3e8ad111e02ee2";
-    hash = "sha256-TpTlYRXB1hnpyQ8fL8DQ1mtLW64zDCvtDZXykahfq5U=";
+    rev = "fddaaa00e3baa3c4e854ab88ab46fd3b4ced3a62";
+    hash = "sha256-KPdv8E0ZaLK49H2Q749UaLYIXdiplIKTrbkD7+KTAYg=";
   };
   buildInputs = [
     glib

From 0e2981418504d581f45983af29cd1b2a585cc019 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Sep 2024 13:02:52 +0000
Subject: [PATCH 22/73] faudio: 24.08 -> 24.09

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

diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix
index 17bf25433848..db62a88d7868 100644
--- a/pkgs/development/libraries/faudio/default.nix
+++ b/pkgs/development/libraries/faudio/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "faudio";
-  version = "24.08";
+  version = "24.09";
 
   src = fetchFromGitHub {
     owner = "FNA-XNA";
     repo = "FAudio";
     rev = version;
-    sha256 = "sha256-DbfUuLKsArznZ4iNUiQfn1hU61bVf4HvEUx9dCrXfYg=";
+    sha256 = "sha256-qojDXGFSn865dbHwhyGiHyyGKHIMI82ai4NyXgjAxD0=";
   };
 
   nativeBuildInputs = [cmake];

From f7947da16c628b0cee43547d2af803ff443b0241 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Fri, 14 Jun 2024 01:58:30 +0000
Subject: [PATCH 23/73] pantheon.switchboard-plug-sound: fix cross compilation

---
 .../pantheon/apps/switchboard-plugs/sound/default.nix         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
index 423102152da4..f6bd304bbfc0 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/sound/default.nix
@@ -9,6 +9,7 @@
 , libadwaita
 , libcanberra
 , libgee
+, glib
 , granite7
 , gtk4
 , pulseaudio
@@ -27,6 +28,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
+    glib
     meson
     ninja
     pkg-config
@@ -43,6 +45,8 @@ stdenv.mkDerivation rec {
     switchboard
   ];
 
+  strictDeps = true;
+
   passthru = {
     updateScript = nix-update-script { };
   };

From cba3c2834c404f0c60322eafb7e4c6ea3bde0605 Mon Sep 17 00:00:00 2001
From: nat <nat@nekopon.pl>
Date: Sun, 1 Sep 2024 15:42:57 +0200
Subject: [PATCH 24/73] lunar-client: 3.2.16 -> 3.2.17

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

diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix
index d061aa3e593b..6ebddafa5dcb 100644
--- a/pkgs/by-name/lu/lunar-client/package.nix
+++ b/pkgs/by-name/lu/lunar-client/package.nix
@@ -6,11 +6,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "lunarclient";
-  version = "3.2.16";
+  version = "3.2.17";
 
   src = fetchurl {
     url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}.AppImage";
-    hash = "sha512-p+a7zirfM4rR4CPsXGa6jPhh0sFvoQN1O/roSZYA+qbhhtRS0MgnvuSN6EKdH37M5cF2KoNOqfapWE3PWWK19A==";
+    hash = "sha512-hzW7khHfWEYPtzMmedy/dXqKh7LPniqI7/0F1FtBtrlDnEIEQUq/7VUcygsVTBI6kuj8vTG5+PYcLez+cYAjqg==";
   };
 
   extraInstallCommands =

From 88bee160aa5a026ae384e94e10f551afa41765ea Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 1 Sep 2024 20:08:43 +0400
Subject: [PATCH 25/73] mapproxy: migrate to by-name

---
 .../mapproxy/default.nix => by-name/ma/mapproxy/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{servers/geospatial/mapproxy/default.nix => by-name/ma/mapproxy/package.nix} (100%)

diff --git a/pkgs/servers/geospatial/mapproxy/default.nix b/pkgs/by-name/ma/mapproxy/package.nix
similarity index 100%
rename from pkgs/servers/geospatial/mapproxy/default.nix
rename to pkgs/by-name/ma/mapproxy/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b005d902b096..d8c4ad01484d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -25976,8 +25976,6 @@ with pkgs;
 
   fit-trackee = callPackage ../servers/geospatial/fit-trackee { };
 
-  mapproxy = callPackage ../servers/geospatial/mapproxy { };
-
   martin = callPackage ../servers/geospatial/martin {
     inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
   };

From 44b73d2160110b054c998d3ff93913a6154b556c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Sep 2024 16:29:02 +0000
Subject: [PATCH 26/73] tui-journal: 0.9.1 -> 0.10.0

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

diff --git a/pkgs/applications/misc/tui-journal/default.nix b/pkgs/applications/misc/tui-journal/default.nix
index d861601364e1..d85f052256ee 100644
--- a/pkgs/applications/misc/tui-journal/default.nix
+++ b/pkgs/applications/misc/tui-journal/default.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tui-journal";
-  version = "0.9.1";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "AmmarAbouZor";
     repo = "tui-journal";
     rev = "v${version}";
-    hash = "sha256-GmLhBlNHVyO0oUvjOBpTEqQiPYZ68MdgwAqt9v2oMdU=";
+    hash = "sha256-5in2GulBGUjmrzEDFGRKYzEvB1Z7etVDM2TIb+hlMQA=";
   };
 
-  cargoHash = "sha256-+5rWjq3/0xfJ5Nbq0kReombuaJkcFmHoqVzzQ4x68Hc=";
+  cargoHash = "sha256-gIBMtzGNcHjJ0ZWLU5+ys4ARHl6mN3PpU5zxsfAzG2M=";
 
   nativeBuildInputs = [
     pkg-config

From ad464a4f531cb0d3dad7ab65d75689aea75d18ee Mon Sep 17 00:00:00 2001
From: George Huebner <george@feyor.sh>
Date: Sun, 1 Sep 2024 12:18:48 -0500
Subject: [PATCH 27/73] gdb: use meta.badPlatforms instead of assert iff
 aarch64-darwin

---
 pkgs/development/tools/misc/gdb/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index 19f6890ac964..5cf686dcfb6b 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -27,7 +27,6 @@ let
 in
 
 assert pythonSupport -> python3 != null;
-assert lib.asserts.assertMsg (stdenv.targetPlatform.system != "aarch64-darwin") "GDB does not support aarch64-darwin as a target";
 
 stdenv.mkDerivation rec {
   pname = targetPrefix + basename + lib.optionalString hostCpuOnly "-host-cpu-only";
@@ -156,6 +155,9 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl3Plus;
 
     platforms = with lib.platforms; linux ++ cygwin ++ freebsd ++ darwin;
+    # upstream does not support targeting aarch64-darwin;
+    # see https://inbox.sourceware.org/gdb/3185c3b8-8a91-4beb-a5d5-9db6afb93713@Spark/
+    badPlatforms = lib.optionals (stdenv.targetPlatform.system == "aarch64-darwin") meta.platforms;
     maintainers = with lib.maintainers; [ pierron globin lsix ];
   };
 }

From 62fe2904d777d3683896adb314ca2fe284ddb24a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Sep 2024 17:42:53 +0000
Subject: [PATCH 28/73] python312Packages.quantile-forest: 1.3.9 -> 1.3.10

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

diff --git a/pkgs/development/python-modules/quantile-forest/default.nix b/pkgs/development/python-modules/quantile-forest/default.nix
index 544171a28e57..e973e99fe0ac 100644
--- a/pkgs/development/python-modules/quantile-forest/default.nix
+++ b/pkgs/development/python-modules/quantile-forest/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "quantile-forest";
-  version = "1.3.9";
+  version = "1.3.10";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "zillow";
     repo = "quantile-forest";
     rev = "refs/tags/v${version}";
-    hash = "sha256-uvfY17ADyuLc3zx2Z2uEKOijqiuefiN2uSh0j+ZOz4w=";
+    hash = "sha256-Od8x+dgrJubTWhfrLYM8tVf0PSIYYpafUkoorS/aYKg=";
   };
 
   build-system = [

From 9762339aaab340e350527492929c65809a5a9232 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 1 Sep 2024 20:11:07 +0400
Subject: [PATCH 29/73] mapproxy: add geospatial team to maintainers

---
 pkgs/by-name/ma/mapproxy/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/mapproxy/package.nix b/pkgs/by-name/ma/mapproxy/package.nix
index ccd193453093..454e9329819a 100644
--- a/pkgs/by-name/ma/mapproxy/package.nix
+++ b/pkgs/by-name/ma/mapproxy/package.nix
@@ -32,10 +32,11 @@ buildPythonApplication rec {
   #    https://github.com/NixOS/nixpkgs/issues/33876
   #    https://github.com/NixOS/nixpkgs/pull/56480
   doCheck = false;
-  meta = with lib; {
+
+  meta = {
   description = "Open source proxy for geospatial data";
   homepage = "https://mapproxy.org/";
-  license = licenses.asl20;
-  maintainers = with maintainers; [ rakesh4g ];
+  license = lib.licenses.asl20;
+  maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ rakesh4g ]);
   };
 }

From c01f00fc9cafe90f735525a67a81e7a4de80cb66 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Sep 2024 18:53:42 +0000
Subject: [PATCH 30/73] python312Packages.langfuse: 2.44.1 -> 2.45.1

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

diff --git a/pkgs/development/python-modules/langfuse/default.nix b/pkgs/development/python-modules/langfuse/default.nix
index b2e41a0ff96c..84879b365973 100644
--- a/pkgs/development/python-modules/langfuse/default.nix
+++ b/pkgs/development/python-modules/langfuse/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "langfuse";
-  version = "2.44.1";
+  version = "2.45.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langfuse";
     repo = "langfuse-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-RoejwWVV3+zRWKkbhV82Gf9DSqrQ2r+SoR99mzmc3TM=";
+    hash = "sha256-CErrC5hVBrdUFYxN3JxAIo5eb/OGnISWfzClSwrrYLM=";
   };
 
   build-system = [ poetry-core ];

From a21545d6a53e899788b115d3a3e3b3084bec8c4b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Sep 2024 18:53:48 +0000
Subject: [PATCH 31/73] quarkus: 3.13.2 -> 3.14.1

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

diff --git a/pkgs/by-name/qu/quarkus/package.nix b/pkgs/by-name/qu/quarkus/package.nix
index afd37f851173..18f47753c8fd 100644
--- a/pkgs/by-name/qu/quarkus/package.nix
+++ b/pkgs/by-name/qu/quarkus/package.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "quarkus-cli";
-  version = "3.13.2";
+  version = "3.14.1";
 
   src = fetchurl {
     url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz";
-    hash = "sha256-6rt40cQde6ck0Eq3YRfN+l2QP18CHTxFj2EJyiPgkrE=";
+    hash = "sha256-OiA45lItW5IhOboxS+/kcUxvuVuJmvT+m6wX1REGUGI=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 15b6250dc3c75998ee7136f52adb689b7c349197 Mon Sep 17 00:00:00 2001
From: gaykitty <126119280+gaykitty@users.noreply.github.com>
Date: Sun, 1 Sep 2024 14:50:16 -0400
Subject: [PATCH 32/73] stargazer: 1.3.0 -> 1.3.1

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

diff --git a/pkgs/servers/gemini/stargazer/default.nix b/pkgs/servers/gemini/stargazer/default.nix
index 90d2ed5e5137..8aae6fa7b7fe 100644
--- a/pkgs/servers/gemini/stargazer/default.nix
+++ b/pkgs/servers/gemini/stargazer/default.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "stargazer";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromSourcehut {
     owner = "~zethra";
     repo = "stargazer";
     rev = version;
-    hash = "sha256-Qzg9sCdD29FghHMY6obeVHMD0SRvzi9J6MhEUvcQgbE=";
+    hash = "sha256-0vbQDHuLrgrsWiOb2hb6lYylJm5o/wOzoDIw85H8Eh0=";
   };
 
-  cargoHash = "sha256-SQzYEFdSUC1znukot3G3WoOsQGlYP7ICXpoy/w9eO8A=";
+  cargoHash = "sha256-EtRJsm6jo0fSEN9s0cS4IBWV/NnuUeDTa/x1utbh85k=";
 
   passthru = {
     tests.basic-functionality = nixosTests.stargazer;

From 6ddbfadefcc01e57209baaf88e1f31c265325ad0 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 1 Sep 2024 18:26:32 +0400
Subject: [PATCH 33/73] chirp: migrate to by-name

---
 .../radio/chirp/default.nix => by-name/ch/chirp/package.nix}  | 0
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 4 deletions(-)
 rename pkgs/{applications/radio/chirp/default.nix => by-name/ch/chirp/package.nix} (100%)

diff --git a/pkgs/applications/radio/chirp/default.nix b/pkgs/by-name/ch/chirp/package.nix
similarity index 100%
rename from pkgs/applications/radio/chirp/default.nix
rename to pkgs/by-name/ch/chirp/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1352af0af5c4..3c65b57cc193 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -29173,10 +29173,6 @@ with pkgs;
 
   chatty = callPackage ../applications/networking/instant-messengers/chatty { };
 
-  chirp = callPackage ../applications/radio/chirp {
-    python3 = python311;
-  };
-
   browsh = callPackage ../applications/networking/browsers/browsh { };
 
   brotab = callPackage ../tools/misc/brotab {

From ce1d083cc91a4e411b4f8b9aa6b72bc5d2a98e61 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Sep 2024 19:32:48 +0000
Subject: [PATCH 34/73] crossplane-cli: 1.16.0 -> 1.16.1

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

diff --git a/pkgs/by-name/cr/crossplane-cli/package.nix b/pkgs/by-name/cr/crossplane-cli/package.nix
index 9fc066de866c..204d89407d6b 100644
--- a/pkgs/by-name/cr/crossplane-cli/package.nix
+++ b/pkgs/by-name/cr/crossplane-cli/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "crossplane-cli";
-  version = "1.16.0";
+  version = "1.16.1";
 
   src = fetchFromGitHub {
     owner = "crossplane";
     repo = "crossplane";
     rev = "v${version}";
-    hash = "sha256-1067l3DM6/kW6d35+9nfMdFtu8jIzw/QJaHFKzOTbSc=";
+    hash = "sha256-wRbQKpWEzos5fzzf1tUF2xQAlk8KIrhXJ/QZ9JKCa2M=";
   };
 
-  vendorHash = "sha256-Ccc7hEsHkHw2P5cgMB06VVlHur5DCPclaEMoFCwoSrA=";
+  vendorHash = "sha256-XzIDLtEP4wrz23Cewz1QFuS62F/XQr7JNoaPAQfanEs=";
 
   ldflags = [
     "-s"

From 9541169581ae509e0773fb340882f4473f68f9e5 Mon Sep 17 00:00:00 2001
From: Kimat Boven <kimat@users.noreply.github.com>
Date: Sat, 31 Aug 2024 18:57:59 +0200
Subject: [PATCH 35/73] vale-ls: 0.3.7-unstable-2024-03-13 -> 0.3.8

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

diff --git a/pkgs/by-name/va/vale-ls/package.nix b/pkgs/by-name/va/vale-ls/package.nix
index b79f94c7627c..a6a84d4a2ce0 100644
--- a/pkgs/by-name/va/vale-ls/package.nix
+++ b/pkgs/by-name/va/vale-ls/package.nix
@@ -9,15 +9,15 @@
 , vale
 }:
 
-rustPlatform.buildRustPackage {
+rustPlatform.buildRustPackage rec {
   pname = "vale-ls";
-  version = "0.3.7-unstable-2024-03-13";
+  version = "0.3.8";
 
   src = fetchFromGitHub {
     owner = "errata-ai";
     repo = "vale-ls";
-    rev = "473e16bc88ec48b35e2bd208adc174878c4d5396";
-    hash = "sha256-ywJsnWMc9NSjYjsK6SXdMAQl+hcP+KQ7Xp1A99aeqAg=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-+2peLqj3/ny0hDwJVKEp2XS68VO50IvpCB2fvZoEdJo=";
   };
 
   nativeBuildInputs = [
@@ -43,7 +43,7 @@ rustPlatform.buildRustPackage {
 
   env.OPENSSL_NO_VENDOR = true;
 
-  cargoHash = "sha256-ifKdSTmVWfDZF5Kn9b5JpzDxa160oRTfzjvxeL9POBg=";
+  cargoHash = "sha256-YurMB54jeMQIAOgDQhXEYrkYUYrSl02M9JG5Wtp6Eb8=";
 
   postInstall = ''
     wrapProgram $out/bin/vale-ls \

From 6862b7e0d8311cd0e555e567a777ee90425460bc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Sep 2024 22:44:11 +0000
Subject: [PATCH 36/73] pantheon.switchboard-plug-mouse-touchpad: 8.0.0 ->
 8.0.1

---
 .../apps/switchboard-plugs/mouse-touchpad/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
index 360e175e6b1b..9084297c05b1 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/mouse-touchpad/default.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-mouse-touchpad";
-  version = "8.0.0";
+  version = "8.0.1";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = pname;
     rev = version;
-    sha256 = "sha256-OXaCftfPPAIxDGOBKM4S7Bv//j0sWy/CsbqvugxSZ70=";
+    sha256 = "sha256-aOJnjHCyc1tSyF7AuW5nXUXcvzBnZ+pwU91Mk+veusg=";
   };
 
   patches = [

From d9fd1721a46cf64877b5367c078dce81efe6201c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 1 Sep 2024 23:51:44 +0000
Subject: [PATCH 37/73] pluto: 5.20.1 -> 5.20.2

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

diff --git a/pkgs/applications/networking/cluster/pluto/default.nix b/pkgs/applications/networking/cluster/pluto/default.nix
index f6e75ebd0648..ca3321967031 100644
--- a/pkgs/applications/networking/cluster/pluto/default.nix
+++ b/pkgs/applications/networking/cluster/pluto/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "pluto";
-  version = "5.20.1";
+  version = "5.20.2";
 
   src = fetchFromGitHub {
     owner = "FairwindsOps";
     repo = "pluto";
     rev = "v${version}";
-    hash = "sha256-M0top2czb9iPbA0JxDZwRrNT5sEUi8E3uTB+eCN4RDY=";
+    hash = "sha256-JMpqZnlFMHC6b+nQ6UIcOF0HKz4VE8/YXEnofUMHhxY=";
   };
 
   vendorHash = "sha256-VkaFANSzKOpmHWUwFp7YjwvsJegcJOrvJOBNNAIxOak=";

From 4491d94ddd5a14d8ec4b4df6d9fe9f8bed6841d4 Mon Sep 17 00:00:00 2001
From: hellodword <46193371+hellodword@users.noreply.github.com>
Date: Mon, 2 Sep 2024 01:31:10 +0000
Subject: [PATCH 38/73] maintainers: add hellodword

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 39c7ff2d4ae4..3094d311c242 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -8200,6 +8200,11 @@
     githubId = 2405974;
     name = "Sébastian Méric de Bellefon";
   };
+  hellodword = {
+    github = "hellodword";
+    githubId = 46193371;
+    name = "hellodword";
+  };
   hellwolf = {
     email = "zhicheng.miao@gmail.com";
     github = "hellwolf";

From 4c69704fadc2cbbdd7bb27127244c9d29d6b07ec Mon Sep 17 00:00:00 2001
From: hellodword <46193371+hellodword@users.noreply.github.com>
Date: Mon, 2 Sep 2024 01:32:22 +0000
Subject: [PATCH 39/73] lxgw-fusionkai: init at 24.134

---
 pkgs/by-name/lx/lxgw-fusionkai/package.nix | 33 ++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 pkgs/by-name/lx/lxgw-fusionkai/package.nix

diff --git a/pkgs/by-name/lx/lxgw-fusionkai/package.nix b/pkgs/by-name/lx/lxgw-fusionkai/package.nix
new file mode 100644
index 000000000000..99c7a8e3e37f
--- /dev/null
+++ b/pkgs/by-name/lx/lxgw-fusionkai/package.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  fetchFromGitHub,
+  stdenvNoCC,
+}:
+
+stdenvNoCC.mkDerivation rec {
+  pname = "lxgw-fusionkai";
+  version = "24.134";
+
+  src = fetchFromGitHub {
+    owner = "lxgw";
+    repo = "FusionKai";
+    rev = "v${version}";
+    hash = "sha256-pEISoFEsv8SJOGa2ud/nV1yvl8T9kakfKENu3mfYA5A=";
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm644 *.ttf -t $out/share/fonts/truetype
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/lxgw/FusionKai";
+    description = "Simplified Chinese font derived from LXGW WenKai GB, iansui and Klee One";
+    license = licenses.ofl;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ hellodword ];
+  };
+}

From a7db8e4b68fa00533fe46bad31543949c4849701 Mon Sep 17 00:00:00 2001
From: qubitnano <146656568+qubitnano@users.noreply.github.com>
Date: Sun, 1 Sep 2024 21:54:43 -0400
Subject: [PATCH 40/73] mongodb-5_0: 5.0.28 -> 5.0.29

---
 pkgs/servers/nosql/mongodb/5.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/mongodb/5.0.nix b/pkgs/servers/nosql/mongodb/5.0.nix
index 1738ba2f05e1..c0704ad2630e 100644
--- a/pkgs/servers/nosql/mongodb/5.0.nix
+++ b/pkgs/servers/nosql/mongodb/5.0.nix
@@ -10,8 +10,8 @@ let
   };
   variants = if stdenv.isLinux then
     {
-      version = "5.0.28";
-      sha256 = "sha256-r4JltJL4w0TX6dT45W3tYptShnEGxnlF7tYe5mCuc78=";
+      version = "5.0.29";
+      sha256 = "sha256-27+SXo0fjFwJFFm/NhpDhq95dMwiN8RCJO7j5ic49Ls=";
       patches = [ ./fix-build-with-boost-1.79-5_0-linux.patch ];
     }
   else lib.optionalAttrs stdenv.isDarwin

From 6e1ce9712360832d8442616dbf0d562c036c89ba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Sep 2024 02:23:45 +0000
Subject: [PATCH 41/73] obs-cmd: 0.17.6 -> 0.17.7

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

diff --git a/pkgs/by-name/ob/obs-cmd/package.nix b/pkgs/by-name/ob/obs-cmd/package.nix
index e537ea521a7d..181145c1a0f2 100644
--- a/pkgs/by-name/ob/obs-cmd/package.nix
+++ b/pkgs/by-name/ob/obs-cmd/package.nix
@@ -5,16 +5,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "obs-cmd";
-  version = "0.17.6";
+  version = "0.17.7";
 
   src = fetchFromGitHub {
     owner = "grigio";
     repo = "obs-cmd";
     rev = "v${version}";
-    hash = "sha256-bZ3N0wCTXyCv6iBQDlieMDFa80yNu1XrI4W5EaN5y/I=";
+    hash = "sha256-+rsX86PrTlswi7uItyfOqYWziJ0kLl9X86TMtcmMCKo=";
   };
 
-  cargoHash = "sha256-gIJOkWlBD1rv6bKf++v/pyI8/awdnZBo/U/5PFnEcvg=";
+  cargoHash = "sha256-u+IHQiKEX0KUkwz4KsqwIgdo3KAxarPZgrmJWA1qQ50=";
 
   meta = with lib; {
     description = "Minimal CLI to control OBS Studio via obs-websocket";

From 372f46490a2267b1f164d9706bd803663f5d0a9b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Sep 2024 02:39:42 +0000
Subject: [PATCH 42/73] conceal: 0.5.3 -> 0.5.4

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

diff --git a/pkgs/applications/misc/conceal/default.nix b/pkgs/applications/misc/conceal/default.nix
index 3641aebaeb4e..94a4d427e84b 100644
--- a/pkgs/applications/misc/conceal/default.nix
+++ b/pkgs/applications/misc/conceal/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "conceal";
-  version = "0.5.3";
+  version = "0.5.4";
 
   src = fetchFromGitHub {
     owner = "TD-Sky";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-LPuPpcs0PtZk516wM9cfhvV12550VBQugVvbQBWxnxA=";
+    sha256 = "sha256-N/KlxtxzEDwUvQMpgf2S6u7MaYiF0eXnMrGoowc08J0=";
   };
 
-  cargoHash = "sha256-7FUUte6hAY+KyD9t3rgibkhARFcWIIrFyX4vWSAwcBU=";
+  cargoHash = "sha256-50EHc8ZHzbl5IFpi5k3/Katc3FaxBgnpf8COrpPHZWk=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From d39e2b029d79eff0beb16908a0fcd87f6d87cfc9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 19 Aug 2024 09:08:53 +0000
Subject: [PATCH 43/73] mmv: 2.6 -> 2.7

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

diff --git a/pkgs/tools/misc/mmv/default.nix b/pkgs/tools/misc/mmv/default.nix
index 534e5f22cc2b..e681d1fd8879 100644
--- a/pkgs/tools/misc/mmv/default.nix
+++ b/pkgs/tools/misc/mmv/default.nix
@@ -1,15 +1,15 @@
 { lib, stdenv, fetchFromGitHub, pkg-config, gengetopt, m4, gnupg
-, git, perl, autoconf, automake, help2man, boehmgc }:
+, git, perl, autoconf, automake, help2man }:
 
 stdenv.mkDerivation rec {
   pname = "mmv";
-  version = "2.6";
+  version = "2.7";
 
   src = fetchFromGitHub {
     owner = "rrthomas";
     repo = "mmv";
     rev = "v${version}";
-    hash = "sha256-hYSTENSmkJP5rAemDyTzbzMKFrWYcMpsJDRWq43etTM=";
+    hash = "sha256-uiRKdkBLr3ZSovIqso/F85cfoSrymZpyzGa63wp5XnY=";
     fetchSubmodules = true;
   };
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ gengetopt m4 git gnupg perl autoconf automake help2man pkg-config ];
-  buildInputs = [ boehmgc ];
+
   enableParallelBuilding = true;
 
   env = lib.optionalAttrs stdenv.cc.isClang {

From 09287419950de6f1bff83122f445d53d95442bb7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Sep 2024 03:20:48 +0000
Subject: [PATCH 44/73] xv: 6.0.0 -> 6.0.1

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

diff --git a/pkgs/applications/graphics/xv/default.nix b/pkgs/applications/graphics/xv/default.nix
index bb68b8102493..86103e75067c 100644
--- a/pkgs/applications/graphics/xv/default.nix
+++ b/pkgs/applications/graphics/xv/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xv";
-  version = "6.0.0";
+  version = "6.0.1";
 
   src = fetchFromGitHub {
     owner = "jasper-software";
     repo = "xv";
     rev = "v${version}";
-    sha256 = "sha256-KPX/HA9CUaRaIHkcFcM+oo3UasEQfZgmZwi6e/pbFuE=";
+    sha256 = "sha256-IFbR/1oksRkpJvvu+7TwLFtDujuAmV+sX8Njn6gpgBg=";
   };
 
   nativeBuildInputs = [ cmake ];

From 46cfae29076f988bcb2cb277e450f920e54bc531 Mon Sep 17 00:00:00 2001
From: luftmensch-luftmensch <valentinobocchetti59@gmail.com>
Date: Mon, 29 Jul 2024 10:06:25 +0200
Subject: [PATCH 45/73] radio-cli: init at 2.3.1

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

diff --git a/pkgs/by-name/ra/radio-cli/package.nix b/pkgs/by-name/ra/radio-cli/package.nix
new file mode 100644
index 000000000000..655e416b554a
--- /dev/null
+++ b/pkgs/by-name/ra/radio-cli/package.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  makeWrapper,
+  pkg-config,
+  openssl,
+  mpv,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "radio-cli";
+  version = "2.3.1";
+
+  src = fetchFromGitHub {
+    owner = "margual56";
+    repo = "radio-cli";
+    rev = "v${version}";
+    hash = "sha256-XN0IzU7+V0zUUXfOygWrZXQX09IEpVo2Rhwfv+Lny/E=";
+  };
+
+  cargoHash = "sha256-XCzDNUZpyfu4gJr1lUx1/VbLkEv3OnJvYku0eEJbK5s=";
+
+  buildInputs = [ openssl ];
+
+  nativeBuildInputs = [
+    pkg-config
+    makeWrapper
+  ];
+
+  postInstall = ''
+    wrapProgram "$out/bin/radio-cli" \
+      --suffix PATH : ${lib.makeBinPath [ mpv ]}
+  '';
+
+  meta = {
+    description = "Simple radio CLI written in rust";
+    homepage = "https://github.com/margual56/radio-cli";
+    changelog = "https://github.com/margual56/radio-cli/releases/tag/v${version}";
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ luftmensch-luftmensch ];
+    mainProgram = "radio-cli";
+    platforms = lib.platforms.linux;
+  };
+}

From 83f22535141b2e82a1c10e68fc4efabf5ef36260 Mon Sep 17 00:00:00 2001
From: Florian Brandes <florian.brandes@posteo.de>
Date: Mon, 2 Sep 2024 12:34:14 +0200
Subject: [PATCH 46/73] radicle-httpd: 0.15.0 -> 0.17.0

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
---
 pkgs/by-name/ra/radicle-httpd/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ra/radicle-httpd/package.nix b/pkgs/by-name/ra/radicle-httpd/package.nix
index dc06524034ad..d5f5f9171563 100644
--- a/pkgs/by-name/ra/radicle-httpd/package.nix
+++ b/pkgs/by-name/ra/radicle-httpd/package.nix
@@ -13,17 +13,17 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "radicle-httpd";
-  version = "0.15.0";
+  version = "0.17.0";
   env.RADICLE_VERSION = version;
 
   src = fetchgit {
     url = "https://seed.radicle.xyz/z4V1sjrXqjvFdnCUbxPFqd5p4DtH5.git";
     rev = "refs/namespaces/z6MkkfM3tPXNPrPevKr3uSiQtHPuwnNhu2yUVjgd2jXVsVz5/refs/tags/v${version}";
-    hash = "sha256-wd+ST8ax988CpGcdFb3LUcA686U7BLmbi1k8Y3GAEIc=";
+    hash = "sha256-nstyb1rSll3Sl0DlA9JAAwvr6JN8okJ03WoQnE4dXEk=";
     sparseCheckout = [ "radicle-httpd" ];
   };
   sourceRoot = "${src.name}/radicle-httpd";
-  cargoHash = "sha256-YIux5/BFAZNI9ZwP4lVKj4UGQ4lKrhZ675bCdUaXN70=";
+  cargoHash = "sha256-M4tDtUXS99/Zb1Z71CTdW9gMgRR30rbwA6wK7nlwblQ=";
 
   nativeBuildInputs = [
     asciidoctor

From 4a9a8c37a8bc07475c86b128229cc01e50abedce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=84=A1=E5=90=8D=E6=B0=8F?= <hello@edgerunners.eu.org>
Date: Mon, 26 Aug 2024 08:48:41 +0800
Subject: [PATCH 47/73] wayprompt: init at 0.1.2

---
 pkgs/by-name/wa/wayprompt/build.zig.zon.nix | 48 +++++++++++++++++
 pkgs/by-name/wa/wayprompt/package.nix       | 58 +++++++++++++++++++++
 2 files changed, 106 insertions(+)
 create mode 100644 pkgs/by-name/wa/wayprompt/build.zig.zon.nix
 create mode 100644 pkgs/by-name/wa/wayprompt/package.nix

diff --git a/pkgs/by-name/wa/wayprompt/build.zig.zon.nix b/pkgs/by-name/wa/wayprompt/build.zig.zon.nix
new file mode 100644
index 000000000000..42deb3f11a67
--- /dev/null
+++ b/pkgs/by-name/wa/wayprompt/build.zig.zon.nix
@@ -0,0 +1,48 @@
+# generated by zon2nix (https://github.com/nix-community/zon2nix)
+
+{ linkFarm, fetchzip }:
+
+linkFarm "zig-packages" [
+  {
+    name = "12201bbf05e1fb73323a9b13d2599dc4bf82851e6d328d7523a1af5b861a87edf286";
+    path = fetchzip {
+      url = "https://git.sr.ht/~leon_plickat/zig-ini/archive/879c74a3a801d49fa34343aebd55a22f591899b3.tar.gz";
+      hash = "sha256-in7abjMSWtnmrri2tbTJW2WVL4ZLrKkTT8Bxy8njJT4=";
+    };
+  }
+  {
+    name = "12202727aaaf0e742d4945be55af1ace8b25902095e0c1b0a24b70cc80a81b7ac518";
+    path = fetchzip {
+      url = "https://git.sr.ht/~leon_plickat/zig-spoon/archive/fdba8e643c9558254bf4e6c600dfbd782fa7a267.tar.gz";
+      hash = "sha256-c8V+HqtDMW6JBDKilzrC39GizvWPp1eMton1X4PpxJI=";
+    };
+  }
+  {
+    name = "1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242";
+    path = fetchzip {
+      url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.2.0.tar.gz";
+      hash = "sha256-dvit+yvc0MnipqWjxJdfIsA6fJaJZOaIpx4w4woCxbE=";
+    };
+  }
+  {
+    name = "12209db20ce873af176138b76632931def33a10539387cba745db72933c43d274d56";
+    path = fetchzip {
+      url = "https://codeberg.org/ifreund/zig-pixman/archive/v0.2.0.tar.gz";
+      hash = "sha256-zcfZEMnipWDPuptl9UN0PoaJDjy2EHc7Wwi4GQq3hkY=";
+    };
+  }
+  {
+    name = "1220a4029ee3ee70d3175c69878e2b70dccd000c4324bc74ba800d8a143b7250fb38";
+    path = fetchzip {
+      url = "https://git.sr.ht/~novakane/zig-fcft/archive/1.1.0.tar.gz";
+      hash = "sha256-JAR6Ticav9l/3aemJWGsjXMEUyHjuhUr3L0fznnLoEY=";
+    };
+  }
+  {
+    name = "1220c90b2228d65fd8427a837d31b0add83e9fade1dcfa539bb56fd06f1f8461605f";
+    path = fetchzip {
+      url = "https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.2.0.tar.gz";
+      hash = "sha256-T+EZiStBfmxFUjaX05WhYkFJ8tRok/UQtpc9QY9NxZk=";
+    };
+  }
+]
diff --git a/pkgs/by-name/wa/wayprompt/package.nix b/pkgs/by-name/wa/wayprompt/package.nix
new file mode 100644
index 000000000000..ac4fdd35bfbc
--- /dev/null
+++ b/pkgs/by-name/wa/wayprompt/package.nix
@@ -0,0 +1,58 @@
+{
+  callPackage,
+  lib,
+  zig_0_13,
+  stdenv,
+  fetchFromSourcehut,
+  fcft,
+  libxkbcommon,
+  pixman,
+  pkg-config,
+  scdoc,
+  wayland,
+  wayland-protocols,
+  wayland-scanner,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "wayprompt";
+  version = "0.1.2";
+
+  src = fetchFromSourcehut {
+    owner = "~leon_plickat";
+    repo = "wayprompt";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-+9Zgq5/Zbb1I3CMH1pivPkddThaGDXM+vVCzWppXq+0=";
+  };
+
+  deps = callPackage ./build.zig.zon.nix { };
+
+  nativeBuildInputs = [
+    zig_0_13.hook
+    pkg-config
+    wayland
+    wayland-scanner
+    scdoc
+  ];
+
+  buildInputs = [
+    fcft
+    libxkbcommon
+    pixman
+    wayland-protocols
+  ];
+
+  zigBuildFlags = [
+    "--system"
+    "${finalAttrs.deps}"
+  ];
+
+  meta = {
+    homepage = "https://git.sr.ht/~leon_plickat/wayprompt";
+    description = "Multi-purpose (password-)prompt tool for Wayland";
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ sg-qwt ];
+    mainProgram = "pinentry-wayprompt";
+    platforms = lib.platforms.linux;
+  };
+})

From 34e0a7d26db638a1527c497729693ce8d682a8f1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Sep 2024 11:36:09 +0000
Subject: [PATCH 48/73] mame: 0.268 -> 0.269

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

diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix
index e16bd97c2cd7..fae7a0d3fcf9 100644
--- a/pkgs/applications/emulators/mame/default.nix
+++ b/pkgs/applications/emulators/mame/default.nix
@@ -38,14 +38,14 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "mame";
-  version = "0.268";
+  version = "0.269";
   srcVersion = builtins.replaceStrings [ "." ] [ "" ] version;
 
   src = fetchFromGitHub {
     owner = "mamedev";
     repo = "mame";
     rev = "mame${srcVersion}";
-    hash = "sha256-zH/82WC4xXa/NMJ2W4U57Uv8+5994U5YcMbRvPiAtTI=";
+    hash = "sha256-ECOPohrfAVz0Rx/oYBFJvo91FoS76RJuBzadfXoXB4c=";
   };
 
   outputs = [ "out" "tools" ];

From d754e0849c9cb1fb98411960ec84aab081920b38 Mon Sep 17 00:00:00 2001
From: Scott Edlund <sedlund@users.noreply.github.com>
Date: Mon, 2 Sep 2024 14:22:44 +0200
Subject: [PATCH 49/73] xfsprogs: update homepage

---
 pkgs/tools/filesystems/xfsprogs/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix
index 5020a7facf43..a95309053ad0 100644
--- a/pkgs/tools/filesystems/xfsprogs/default.nix
+++ b/pkgs/tools/filesystems/xfsprogs/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = with lib; {
-    homepage = "https://xfs.org/";
+    homepage = "https://xfs.wiki.kernel.org";
     description = "SGI XFS utilities";
     license = with licenses; [ gpl2Only lgpl21 gpl3Plus ];  # see https://git.kernel.org/pub/scm/fs/xfs/xfsprogs-dev.git/tree/debian/copyright
     platforms = platforms.linux;

From 047dd2576c99b836a550a43f25f9e2d127c802e3 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Mon, 2 Sep 2024 12:23:31 +0000
Subject: [PATCH 50/73] audiobookshelf: use built-in mechanism to skip binaries
 check

---
 pkgs/by-name/au/audiobookshelf/package.nix | 8 --------
 pkgs/by-name/au/audiobookshelf/wrapper.nix | 1 +
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/pkgs/by-name/au/audiobookshelf/package.nix b/pkgs/by-name/au/audiobookshelf/package.nix
index 91008472059b..efa34166f093 100644
--- a/pkgs/by-name/au/audiobookshelf/package.nix
+++ b/pkgs/by-name/au/audiobookshelf/package.nix
@@ -56,14 +56,6 @@ buildNpmPackage {
   inherit pname src;
   inherit (source) version;
 
-  postPatch = ''
-    # Always skip version checks of the binary manager.
-    # We provide our own binaries, and don't want to trigger downloads.
-    substituteInPlace server/managers/BinaryManager.js --replace-fail \
-      'if (!this.validVersions.length) return true' \
-      'return true'
-  '';
-
   buildInputs = [ util-linux ];
   nativeBuildInputs = [ python3 ];
 
diff --git a/pkgs/by-name/au/audiobookshelf/wrapper.nix b/pkgs/by-name/au/audiobookshelf/wrapper.nix
index d8f16829ffb5..87d3358a425c 100644
--- a/pkgs/by-name/au/audiobookshelf/wrapper.nix
+++ b/pkgs/by-name/au/audiobookshelf/wrapper.nix
@@ -52,6 +52,7 @@
 
     NODE_ENV=production \
       SOURCE=nixpkgs \
+      SKIP_BINARIES_CHECK=1 \
       FFMPEG_PATH=${ffmpeg-full}/bin/ffmpeg \
       FFPROBE_PATH=${ffmpeg-full}/bin/ffprobe \
       CONFIG_PATH="$config" \

From 01a72981037e7b6f6dde2c64cd4e6dad3bf697e8 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Mon, 2 Sep 2024 12:23:32 +0000
Subject: [PATCH 51/73] audiobookshelf: 2.12.3 -> 2.13.2

fixes CVE-2024-43797

https://github.com/advplyr/audiobookshelf/releases/tag/v2.13.0
https://github.com/advplyr/audiobookshelf/releases/tag/v2.13.1
https://github.com/advplyr/audiobookshelf/releases/tag/v2.13.2
https://github.com/advplyr/audiobookshelf/compare/v2.13.2..v2.12.3
---
 pkgs/by-name/au/audiobookshelf/source.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/au/audiobookshelf/source.json b/pkgs/by-name/au/audiobookshelf/source.json
index 384ef51404f7..6c761aac6a5a 100644
--- a/pkgs/by-name/au/audiobookshelf/source.json
+++ b/pkgs/by-name/au/audiobookshelf/source.json
@@ -1,9 +1,9 @@
 {
   "owner": "advplyr",
   "repo": "audiobookshelf",
-  "rev": "52a3bc224ae7c79fbb543716a25b731c65a8f76a",
-  "hash": "sha256-SbpoCtd5PJ6fU9muy58J4VxlbKiJM0OfMALHC5DUqFc=",
-  "version": "2.12.3",
-  "depsHash": "sha256-8YUGM+MPYFLpLwWe3W+eObxH4ZklDVGj8bDYkSWTzQg=",
-  "clientDepsHash": "sha256-8xE1M7InH+Rxjpb2rsdvC3LcLV+k8a83BKWCis5P+tY="
+  "rev": "48f232790a5026ac886564ef57660a338a168187",
+  "hash": "sha256-2/lUByeWMZlxk7i+mvzBuxlxD97C+JEtmf/ajht5AOs=",
+  "version": "2.13.2",
+  "depsHash": "sha256-kU5Nrhy6AePwD2/kmvTXvrvGUH8uz3qm3ZvD3kC9EmE=",
+  "clientDepsHash": "sha256-1haujBoC9KyusE52HeepOcvmb6v7EG5XWD4dq1wPfe4="
 }

From 0ea1446704b7f7add26b1970295d3d2825930315 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Mon, 2 Sep 2024 14:28:48 +0200
Subject: [PATCH 52/73] knot-dns: 3.3.9 -> 3.4.0

https://www.knot-dns.cz/docs/latest/html/migration.html#upgrade-3-3-x-to-3-4-x
https://gitlab.nic.cz/knot/knot-dns/-/releases/v3.4.0
---
 pkgs/servers/dns/knot-dns/default.nix        | 8 +++++---
 pkgs/servers/dns/knot-dns/runtime-deps.patch | 7 +++----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/dns/knot-dns/default.nix b/pkgs/servers/dns/knot-dns/default.nix
index 12239f2f10df..e3926fe4947d 100644
--- a/pkgs/servers/dns/knot-dns/default.nix
+++ b/pkgs/servers/dns/knot-dns/default.nix
@@ -1,17 +1,18 @@
 { lib, stdenv, fetchurl, pkg-config, gnutls, liburcu, lmdb, libcap_ng, libidn2, libunistring
 , systemd, nettle, libedit, zlib, libiconv, libintl, libmaxminddb, libbpf, nghttp2, libmnl
 , ngtcp2-gnutls, xdp-tools
+, sphinx
 , autoreconfHook
 , nixosTests, knot-resolver, knot-dns, runCommandLocal
 }:
 
 stdenv.mkDerivation rec {
   pname = "knot-dns";
-  version = "3.3.9";
+  version = "3.4.0";
 
   src = fetchurl {
     url = "https://secure.nic.cz/files/knot-dns/knot-${version}.tar.xz";
-    sha256 = "7cf2bd93bf487179aca1d2acf7b462dc269e769944c3ea73c7f9a4570dde86ab";
+    sha256 = "2730b11398944faa5151c51b0655cf26631090343c303597814f2a57df424736";
   };
 
   outputs = [ "bin" "out" "dev" ];
@@ -29,7 +30,8 @@ stdenv.mkDerivation rec {
     ./runtime-deps.patch
   ];
 
-  nativeBuildInputs = [ pkg-config autoreconfHook ];
+  # FIXME: sphinx is needed for now to get man-pages
+  nativeBuildInputs = [ pkg-config autoreconfHook sphinx ];
   buildInputs = [
     gnutls liburcu libidn2 libunistring
     nettle libedit
diff --git a/pkgs/servers/dns/knot-dns/runtime-deps.patch b/pkgs/servers/dns/knot-dns/runtime-deps.patch
index 19fc9cd07b18..89dba415b3b9 100644
--- a/pkgs/servers/dns/knot-dns/runtime-deps.patch
+++ b/pkgs/servers/dns/knot-dns/runtime-deps.patch
@@ -5,10 +5,9 @@ but that contains also references like include paths.
 Filter these at least in a crude way (whole lines).
 --- a/configure.ac
 +++ b/configure.ac
-@@ -766,5 +766,5 @@ result_msg_base="  Knot DNS $VERSION
- 
--result_msg_esc=$(echo -n "$result_msg_base" | sed '$!s/$/\\n/' | tr -d '\n')
-+result_msg_esc=$(echo -n "$result_msg_base" | grep -Fv "$NIX_STORE" | sed '$!s/$/\\n/' | tr -d '\n')
+@@ -788,5 +788,5 @@ result_msg_base="
+-result_msg_esc=$(echo -n "    Configure:$filtered_config_params\n$result_msg_base" | sed '$!s/$/\\n/' | tr -d '\n')
++result_msg_esc=$(echo -n "    Configure:$filtered_config_params\n$result_msg_base" | grep -Fv "$NIX_STORE" | sed '$!s/$/\\n/' | tr -d '\n')
  
  AC_DEFINE_UNQUOTED([CONFIGURE_SUMMARY],["$result_msg_esc"],[Configure summary])
  

From 8650d279f1dec2cca2f98f20a331892e91d6854c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Mon, 2 Sep 2024 14:35:31 +0200
Subject: [PATCH 53/73] python3Packages.libknot: 3.3.9 -> 3.4.0

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

diff --git a/pkgs/development/python-modules/libknot/default.nix b/pkgs/development/python-modules/libknot/default.nix
index 03f249969a00..7d0ce1a2ed28 100644
--- a/pkgs/development/python-modules/libknot/default.nix
+++ b/pkgs/development/python-modules/libknot/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "libknot";
-  version = "3.3.9";
+  version = "3.4.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-AAjH5+IQdkzTIp1+q638d9dzAfo7nXUudOLQm81P7lU=";
+    hash = "sha256-BtESc9BIZeDNNPJYyMLTeMsNHm+xBcLueyJ7/1iXFos=";
   };
 
   postPatch = ''

From 9b586a40a0c2578473bca9b49bec80e0f4ef4532 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Mon, 2 Sep 2024 14:36:19 +0200
Subject: [PATCH 54/73] prometheus-knot-exporter: 3.3.9 -> 3.4.0

---
 pkgs/servers/monitoring/prometheus/knot-exporter.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/knot-exporter.nix b/pkgs/servers/monitoring/prometheus/knot-exporter.nix
index 5750b0116315..7b8003554438 100644
--- a/pkgs/servers/monitoring/prometheus/knot-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/knot-exporter.nix
@@ -6,13 +6,13 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "knot-exporter";
-  version = "3.3.9";
+  version = "3.4.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "knot_exporter";
     inherit version;
-    hash = "sha256-8OeMWEXnAaLYpZD/bKAm8vtf0mkGCavmJOV4ThWGDDo=";
+    hash = "sha256-YOVLHAJXIgje8Ek7iKGxq4l4PAcWgWnNllRxEJpUcU0=";
   };
 
   nativeBuildInputs = [

From 516c33ac77f0d3bff208564b5d1af75033d2928a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 2 Sep 2024 14:46:40 +0200
Subject: [PATCH 55/73] evcc: 0.130.6 -> 0.130.7

https://github.com/evcc-io/evcc/releases/tag/0.130.7
---
 pkgs/servers/home-automation/evcc/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix
index 4c6bff7e458e..42cee87e595f 100644
--- a/pkgs/servers/home-automation/evcc/default.nix
+++ b/pkgs/servers/home-automation/evcc/default.nix
@@ -16,20 +16,20 @@
 
 buildGo123Module rec {
   pname = "evcc";
-  version = "0.130.6";
+  version = "0.130.7";
 
   src = fetchFromGitHub {
     owner = "evcc-io";
     repo = "evcc";
     rev = version;
-    hash = "sha256-8ThvDl/dxD2YO9Z+iVhq+JQmnL8M9RdWVfHykoRIERg=";
+    hash = "sha256-i5a6IKLLNKMDSUM64q8V0wo835mZomiW7ZptH6y+LDU=";
   };
 
-  vendorHash = "sha256-L04EQwA2HYLTtYZMP2K7ubuq8IqbqHNEF9W3UmM4pOg=";
+  vendorHash = "sha256-wAcapU6OAhsuceJrCa+caYr+po+nkl0+4Gc0QrFTvVk=";
 
   npmDeps = fetchNpmDeps {
     inherit src;
-    hash = "sha256-8DfLh6RhBI6GeTSIvmXCZ8Yudt5TYnimUoAdbOYfWfw=";
+    hash = "sha256-60F6j87T77JEt3ej4FVTc8rnnpZSGzomrQp8VPWjv6Q=";
   };
 
   nativeBuildInputs = [

From 366405164f0eb5a5ad3cdae45c21f6886d24e87c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 2 Sep 2024 14:50:23 +0200
Subject: [PATCH 56/73] home-assistant-custom-lovelace-modules.mushroom: 4.0.5
 -> 4.0.6

https://github.com/piitaya/lovelace-mushroom/releases/tag/v4.0.6
---
 .../custom-lovelace-modules/mushroom/default.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix
index 8a6b64034466..6ca71440690b 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/mushroom/default.nix
@@ -5,16 +5,16 @@
 
 buildNpmPackage rec {
   pname = "mushroom";
-  version = "4.0.5";
+  version = "4.0.6";
 
   src = fetchFromGitHub {
     owner = "piitaya";
     repo = "lovelace-mushroom";
     rev = "v${version}";
-    hash = "sha256-a/3HUwHrAhAutdVIf0/1HVKZwCcfAKxKnAnjU+6YZsU=";
+    hash = "sha256-3zTavmuLrL/JPQE3axhGONxMhOMq0L0QvSj2pCKukmI=";
   };
 
-  npmDepsHash = "sha256-8vVv8fJ403FyFigztVoT3nyTdka3bwLxjug99/PeSrE=";
+  npmDepsHash = "sha256-mzFgk5cGjFBnrVHbB6QQzf1QRAeLMl/6WS3I8jbheu8=";
 
   installPhase = ''
     runHook preInstall

From 4f57a97ab5139af8483e8e6fe62fab02e0b87c35 Mon Sep 17 00:00:00 2001
From: Ali Caglayan <alizter@gmail.com>
Date: Sun, 1 Sep 2024 01:51:27 +0300
Subject: [PATCH 57/73] coq-lsp: 0.1.9 -> 0.2.0

Signed-off-by: Ali Caglayan <alizter@gmail.com>

<!-- ps-id: 63570aa2-90ab-47b4-8d64-c735422c6d36 -->
---
 pkgs/development/coq-modules/coq-lsp/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/coq-modules/coq-lsp/default.nix b/pkgs/development/coq-modules/coq-lsp/default.nix
index 3224e1c337aa..2a6141c6c864 100644
--- a/pkgs/development/coq-modules/coq-lsp/default.nix
+++ b/pkgs/development/coq-modules/coq-lsp/default.nix
@@ -9,15 +9,15 @@
 
   release."0.1.8+8.16".sha256 = "sha256-dEEAK5IXGjHB8D/fYJRQG/oCotoXJuWLxXB0GQlY2eo=";
   release."0.1.9+8.17".sha256 = "sha256-BCsVRKSE9txeKgDfTsu7hQ6MebC+dX2AAqDF9iL7bYE=";
-  release."0.1.9+8.18".sha256 = "sha256-elAXvkyqw/R/EziGn+QdPn42t5rqTVVW08BXGP3HimY=";
-  release."0.1.9+8.19".sha256 = "sha256-0bk0o25aYkrRf5zaWZnNJqqoBZ6u8nSV9QDIWCeFEco=";
+  release."0.2.0+8.18".sha256 = "sha256-OByBB1CLmj2N0AEieBXLVvP6OLGqi0HXra2jE9k3hXU=";
+  release."0.2.0+8.19".sha256 = "sha256-G/UurWHxR2VzjClZCDHYcz7wAQAaYZt+DsADSXMybdk=";
 
   inherit version;
   defaultVersion = with lib.versions; lib.switch coq.coq-version [
     { case = isEq "8.16"; out = "0.1.8+8.16"; }
     { case = isEq "8.17"; out = "0.1.9+8.17"; }
-    { case = isEq "8.18"; out = "0.1.9+8.18"; }
-    { case = isEq "8.19"; out = "0.1.9+8.19"; }
+    { case = isEq "8.18"; out = "0.2.0+8.18"; }
+    { case = isEq "8.19"; out = "0.2.0+8.19"; }
   ] null;
 
   nativeBuildInputs = [ makeWrapper ];

From 2bdda80b0fa7718257716b61f1c48190a45e952a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Sep 2024 13:08:21 +0000
Subject: [PATCH 58/73] intel-compute-runtime: 24.26.30049.6 -> 24.31.30508.7

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

diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix
index 3531a0da94fa..7808788fbdcb 100644
--- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix
+++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "intel-compute-runtime";
-  version = "24.26.30049.6";
+  version = "24.31.30508.7";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "compute-runtime";
     rev = version;
-    hash = "sha256-VZGHVATA6B/+WB541tsnY3lVi526p7+Rd7cSGpNICLU=";
+    hash = "sha256-8oerVjEeqouOT0+9YgNYxK2200XyUSPu5hDnZg+Ong4=";
   };
 
   nativeBuildInputs = [ cmake pkg-config ];

From 4b6c89a6702e4feb361491ed932f4d42b12a6d71 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 2 Sep 2024 12:53:54 +0200
Subject: [PATCH 59/73] lib.systems: add rustTarget for riscv32

Fixes buildPackages.rustc when cross compiling to riscv32.
---
 lib/systems/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index cee09791bf54..955bfa73e8bf 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -376,6 +376,7 @@ let
               "armv7l" = "armv7";
               "armv6l" = "arm";
               "armv5tel" = "armv5te";
+              "riscv32" = "riscv32gc";
               "riscv64" = "riscv64gc";
             }.${cpu.name} or cpu.name;
             vendor_ = final.rust.platform.vendor;

From fcc561f3902f16563a40d4b66c2840336f79c814 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 2 Sep 2024 15:20:36 +0200
Subject: [PATCH 60/73] nixos/tests/prometheus-exporters/knot: update for 3.4.0

Removes deprecated and now removed fields from the config.
---
 nixos/tests/prometheus-exporters.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix
index 6a4abab7cc12..3d12ff128e26 100644
--- a/nixos/tests/prometheus-exporters.nix
+++ b/nixos/tests/prometheus-exporters.nix
@@ -530,9 +530,6 @@ let
                 global-module: mod-stats
                 dnssec-signing: off
                 zonefile-sync: -1
-                journal-db: /var/lib/knot/journal
-                kasp-db: /var/lib/knot/kasp
-                timer-db: /var/lib/knot/timer
                 zonefile-load: difference
                 storage: ${pkgs.buildEnv {
                   name = "foo";

From 76d4d43c6f18bb37bfed00e55c7aa547896fa362 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 2 Sep 2024 15:22:13 +0200
Subject: [PATCH 61/73] nixos/doc/rl-24.11: knot 3.4.0 migration guide

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

diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md
index 54541c24ea09..877f3411c8d7 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -125,6 +125,8 @@
 
 - `grafana` has been updated to version 11.1. This version doesn't support setting `http_addr` to a hostname anymore, an IP address is expected.
 
+- `knot-dns` has been updated to version 3.4.x. Check the [migration guide](https://www.knot-dns.cz/docs/latest/html/migration.html#upgrade-3-3-x-to-3-4-x) for breaking changes.
+
 - `services.kubernetes.kubelet.clusterDns` now accepts a list of DNS resolvers rather than a single string, bringing the module more in line with the upstream Kubelet configuration schema.
 
 - `wstunnel` has had a major version upgrade that entailed rewriting the program in Rust.

From 1827e1451b954be8c6e420ab356e250629f95802 Mon Sep 17 00:00:00 2001
From: bl0v3 <bl0v3@bl0v3.mailme.at.bl0v3_followed_by_dot_and_com>
Date: Mon, 2 Sep 2024 15:34:42 +0200
Subject: [PATCH 62/73] rust: add s390x platform

---
 pkgs/development/compilers/rust/1_80.nix        | 1 +
 pkgs/development/compilers/rust/print-hashes.sh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/development/compilers/rust/1_80.nix b/pkgs/development/compilers/rust/1_80.nix
index f1a5bb8d61ea..4c2efcc367f4 100644
--- a/pkgs/development/compilers/rust/1_80.nix
+++ b/pkgs/development/compilers/rust/1_80.nix
@@ -119,6 +119,7 @@ import ./default.nix
       aarch64-apple-darwin = "e70a9362975b94df7dbc6e2ed5ceab4254dd32f72ba497ff4a70440ace3f729f";
       powerpc64le-unknown-linux-gnu = "9865eeebb5bb20006367d3148d9116576499ec958d847e22b645f008a1bc4170";
       riscv64gc-unknown-linux-gnu = "c8d38e600ef4dea8b375df2d08153393816ffd3dcab18e4d081ddc19e28b5a40";
+      s390x-unknown-linux-gnu = "1e9f1b27ce47d831108e1d1bb6ef7ab86f95bedfea843318292f821142fe1f6c";
       x86_64-unknown-freebsd = "3c8005f488b8dda0fc6d47928868200852106cac2b568934ae9a2e5c89d3a50d";
     };
 
diff --git a/pkgs/development/compilers/rust/print-hashes.sh b/pkgs/development/compilers/rust/print-hashes.sh
index 54c15406df67..e2ff6a815227 100755
--- a/pkgs/development/compilers/rust/print-hashes.sh
+++ b/pkgs/development/compilers/rust/print-hashes.sh
@@ -19,6 +19,7 @@ PLATFORMS=(
   aarch64-apple-darwin
   powerpc64le-unknown-linux-gnu
   riscv64gc-unknown-linux-gnu
+  s390x-unknown-linux-gnu
   x86_64-unknown-freebsd
 )
 BASEURL=https://static.rust-lang.org/dist

From d868c1ce1a46c8cef1d866488124e6deeb475c4c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Sep 2024 14:23:21 +0000
Subject: [PATCH 63/73] python312Packages.aiolifx-themes: 0.5.2 -> 0.5.3

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

diff --git a/pkgs/development/python-modules/aiolifx-themes/default.nix b/pkgs/development/python-modules/aiolifx-themes/default.nix
index 83553044bf89..0afed2af1650 100644
--- a/pkgs/development/python-modules/aiolifx-themes/default.nix
+++ b/pkgs/development/python-modules/aiolifx-themes/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "aiolifx-themes";
-  version = "0.5.2";
+  version = "0.5.3";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "Djelibeybi";
     repo = "aiolifx-themes";
     rev = "refs/tags/v${version}";
-    hash = "sha256-0qC8FvXk7MlvdO4k7tihjE91tbMbnzOs8YvOyzpL4J4=";
+    hash = "sha256-e07moT5XKrJ8PYZFsnibxV9kxUptMNo+Q/noOkKllnI=";
   };
 
   build-system = [ poetry-core ];

From 41189fcd657c4a3d9bbfbf021b5c4ef921a1d7ad Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Mon, 2 Sep 2024 10:33:03 +0100
Subject: [PATCH 64/73] hyprlandPlugins.hyprscroller: 0-unstable-2024-07-04 ->
 0-unstable-2024-09-01

---
 .../hyprwm/hyprland-plugins/hyprscroller.nix                | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix
index f94da804d370..7da59fd5edec 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprscroller.nix
@@ -9,13 +9,13 @@
 
 mkHyprlandPlugin hyprland {
   pluginName = "hyprscroller";
-  version = "0-unstable-2024-07-04";
+  version = "0-unstable-2024-09-01";
 
   src = fetchFromGitHub {
     owner = "dawsers";
     repo = "hyprscroller";
-    rev = "bef840b3f0fd3d37b5c1c9f2704b2efb60173184";
-    hash = "sha256-vkpGSseA7n0/Y+83snbEe7Z++2akdDbvv7eZzM9V3wI=";
+    rev = "5fe29fcbd7103782d55cfb50482c64c31189f02a";
+    hash = "sha256-Fr2OUEO2LgZsLILnXePuMMbzYBnGA9GyIlLWt2P7bLA=";
   };
 
   nativeBuildInputs = [ cmake ];

From 3043a60eabefcaee1a587c240d718d49ebb38156 Mon Sep 17 00:00:00 2001
From: Dovydas Kersys <dovydas@kersys.lt>
Date: Mon, 2 Sep 2024 17:10:39 +0200
Subject: [PATCH 65/73] apple-cursor: modify license

---
 pkgs/data/icons/apple-cursor/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/data/icons/apple-cursor/default.nix b/pkgs/data/icons/apple-cursor/default.nix
index 81643854fc42..6f33219ed6c5 100644
--- a/pkgs/data/icons/apple-cursor/default.nix
+++ b/pkgs/data/icons/apple-cursor/default.nix
@@ -29,7 +29,12 @@ in stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Opensource macOS Cursors";
     homepage = "https://github.com/ful1e5/apple_cursor";
-    license = licenses.gpl3;
+    license = [
+      licenses.gpl3Only
+    
+      # Potentially a derivative work of copyrighted Apple designs
+      licenses.unfree
+    ];
     platforms = platforms.linux;
     maintainers = with maintainers; [ colemickens dxwil ];
   };

From 7e64e4b767d77077e60065eda60c6cb825a349bb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 2 Sep 2024 15:11:29 +0000
Subject: [PATCH 66/73] python312Packages.py-madvr2: 1.6.29 -> 1.6.32

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

diff --git a/pkgs/development/python-modules/py-madvr2/default.nix b/pkgs/development/python-modules/py-madvr2/default.nix
index 1018978cd338..05799d43226a 100644
--- a/pkgs/development/python-modules/py-madvr2/default.nix
+++ b/pkgs/development/python-modules/py-madvr2/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "py-madvr2";
-  version = "1.6.29";
+  version = "1.6.32";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "iloveicedgreentea";
     repo = "py-madvr";
     rev = "refs/tags/${version}";
-    hash = "sha256-ibgmUpHSmOr5glSZPIJXTBDlEnQoWtmJzmEGsggQxnk=";
+    hash = "sha256-yD8DNhYG9oauEGKnX8Qnh0oSwG/AZa8FIRtHVq4DyTE=";
   };
 
   build-system = [ setuptools ];

From e6f33f4a94e0ebe6f0624af51af190beee64f2a9 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 2 Sep 2024 17:54:21 +0200
Subject: [PATCH 67/73] relibc: remove

This has been broken for more than a year on x86_64-linux, and
x86_64-redox doesn't even evaluate far enough to get to its libc.

Given that it doesn't work anyway, and doesn't seem likely to in the
near future, let's remove it until somebody wants to work on it,
because the custom toolchain makes other changes to Rust more
difficult.
---
 pkgs/development/libraries/relibc/Cargo.lock  | 600 ------------------
 pkgs/development/libraries/relibc/default.nix |  85 ---
 pkgs/top-level/all-packages.nix               |   2 -
 3 files changed, 687 deletions(-)
 delete mode 100644 pkgs/development/libraries/relibc/Cargo.lock
 delete mode 100644 pkgs/development/libraries/relibc/default.nix

diff --git a/pkgs/development/libraries/relibc/Cargo.lock b/pkgs/development/libraries/relibc/Cargo.lock
deleted file mode 100644
index b020fc4764b8..000000000000
--- a/pkgs/development/libraries/relibc/Cargo.lock
+++ /dev/null
@@ -1,600 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-[[package]]
-name = "ansi_term"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "hermit-abi 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.72 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "bitflags"
-version = "1.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "cbindgen"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "clap 2.33.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.56 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
- "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "cbitset"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "cc"
-version = "1.0.58"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "clap"
-version = "2.33.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-width 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "vec_map 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "core_io"
-version = "0.1.20181107"
-dependencies = [
- "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "crt0"
-version = "0.1.0"
-
-[[package]]
-name = "crti"
-version = "0.1.0"
-
-[[package]]
-name = "crtn"
-version = "0.1.0"
-
-[[package]]
-name = "getrandom"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.72 (registry+https://github.com/rust-lang/crates.io-index)",
- "wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "goblin"
-version = "0.0.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "plain 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "scroll 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.72 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "itoa"
-version = "0.4.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "lazy_static"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "spin 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "ld_so"
-version = "0.1.0"
-
-[[package]]
-name = "libc"
-version = "0.2.72"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "log"
-version = "0.4.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "memchr"
-version = "2.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "memoffset"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "num-traits"
-version = "0.2.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "plain"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "posix-regex"
-version = "0.1.0"
-
-[[package]]
-name = "ppv-lite86"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "proc-macro2"
-version = "0.4.30"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "unicode-xid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "quote"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "ralloc"
-version = "1.0.0"
-dependencies = [
- "ralloc_shim 0.1.1",
- "unborrow 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "ralloc_shim"
-version = "0.1.1"
-dependencies = [
- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
- "sc 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.72 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "ppv-lite86 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "rand_core"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rand_hc"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.1.56"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "redox_syscall"
-version = "0.2.0"
-source = "git+https://gitlab.redox-os.org/redox-os/syscall?rev=4115e0f43547449ce56f7d7749732813e9505955#4115e0f43547449ce56f7d7749732813e9505955"
-dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "relibc"
-version = "0.1.0"
-dependencies = [
- "cbindgen 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "cbitset 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cc 1.0.58 (registry+https://github.com/rust-lang/crates.io-index)",
- "core_io 0.1.20181107",
- "goblin 0.0.21 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "memoffset 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "posix-regex 0.1.0",
- "ralloc 1.0.0",
- "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.2.0 (git+https://gitlab.redox-os.org/redox-os/syscall?rev=4115e0f43547449ce56f7d7749732813e9505955)",
- "sc 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "spin 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "remove_dir_all"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rustc_version"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "rustc_version"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "ryu"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "sc"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "scroll"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "scroll_derive 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "scroll_derive"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "semver"
-version = "0.1.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "semver"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "semver-parser"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "serde"
-version = "1.0.114"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "serde_derive 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.114"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.56"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "itoa 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "ryu 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "spin"
-version = "0.4.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "strsim"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "syn"
-version = "0.15.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.33"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)",
- "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "tempfile"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.72 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)",
- "remove_dir_all 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "textwrap"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "unicode-width 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "toml"
-version = "0.5.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "unborrow"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "unicode-xid"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "unicode-xid"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "wasi"
-version = "0.9.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[metadata]
-"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
-"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-"checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d"
-"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-"checksum cbindgen 0.13.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2db2df1ebc842c41fd2c4ae5b5a577faf63bd5151b953db752fc686812bee318"
-"checksum cbitset 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e3a9afa72f63942dd7e7f01c67b863ce9df35c523ae10e3dddd3eec8f1e07eac"
-"checksum cc 1.0.58 (registry+https://github.com/rust-lang/crates.io-index)" = "f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518"
-"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-"checksum clap 2.33.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bdfa80d47f954d53a35a64987ca1422f495b8d6483c0fe9f7117b36c2a792129"
-"checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb"
-"checksum goblin 0.0.21 (registry+https://github.com/rust-lang/crates.io-index)" = "6a4013e9182f2345c6b7829b9ef6e670bce0dfca12c6f974457ed2160c2c7fe9"
-"checksum hermit-abi 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9"
-"checksum itoa 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6"
-"checksum lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a374c89b9db55895453a74c1e38861d9deec0b01b405a82516e9d5de4820dea1"
-"checksum libc 0.2.72 (registry+https://github.com/rust-lang/crates.io-index)" = "a9f8082297d534141b30c8d39e9b1773713ab50fdbe4ff30f750d063b3bfd701"
-"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
-"checksum memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
-"checksum memoffset 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f"
-"checksum num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)" = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611"
-"checksum plain 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
-"checksum ppv-lite86 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea"
-"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
-"checksum proc-macro2 1.0.18 (registry+https://github.com/rust-lang/crates.io-index)" = "beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa"
-"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1"
-"checksum quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
-"checksum rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
-"checksum rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-"checksum rand_chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
-"checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
-"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
-"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
-"checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
-"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84"
-"checksum redox_syscall 0.2.0 (git+https://gitlab.redox-os.org/redox-os/syscall?rev=4115e0f43547449ce56f7d7749732813e9505955)" = "<none>"
-"checksum remove_dir_all 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7"
-"checksum rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "c5f5376ea5e30ce23c03eb77cbe4962b988deead10910c372b226388b594c084"
-"checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
-"checksum ryu 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
-"checksum sc 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "176365c8253e381ad147774b6d9730a1b3fe2d7db498af521ed7d968674a55b3"
-"checksum scroll 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2f84d114ef17fd144153d608fba7c446b0145d038985e7a8cc5d08bb0ce20383"
-"checksum scroll_derive 0.9.5 (registry+https://github.com/rust-lang/crates.io-index)" = "8f1aa96c45e7f5a91cb7fabe7b279f02fea7126239fc40b732316e8b6a2d0fcb"
-"checksum semver 0.1.20 (registry+https://github.com/rust-lang/crates.io-index)" = "d4f410fedcf71af0345d7607d246e7ad15faaadd49d240ee3b24e5dc21a820ac"
-"checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-"checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-"checksum serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)" = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3"
-"checksum serde_derive 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)" = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e"
-"checksum serde_json 1.0.56 (registry+https://github.com/rust-lang/crates.io-index)" = "3433e879a558dde8b5e8feb2a04899cf34fdde1fafb894687e52105fc1162ac3"
-"checksum spin 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ceac490aa12c567115b40b7b7fceca03a6c9d53d5defea066123debc83c5dc1f"
-"checksum strsim 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-"checksum syn 0.15.44 (registry+https://github.com/rust-lang/crates.io-index)" = "9ca4b3b69a77cbe1ffc9e198781b7acb0c7365a883670e8f1c1bc66fba79a5c5"
-"checksum syn 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)" = "e8d5d96e8cbb005d6959f119f773bfaebb5684296108fb32600c00cde305b2cd"
-"checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9"
-"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-"checksum toml 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "ffc92d160b1eef40665be3a05630d003936a3bc7da7421277846c2613e92c71a"
-"checksum unborrow 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e92e959f029e4f8ee25d70d15ab58d2b46f98a17bc238b9265ff0c26f6f3d67f"
-"checksum unicode-width 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
-"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
-"checksum unicode-xid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
-"checksum vec_map 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-"checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
-"checksum winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
diff --git a/pkgs/development/libraries/relibc/default.nix b/pkgs/development/libraries/relibc/default.nix
deleted file mode 100644
index 437da86e8c21..000000000000
--- a/pkgs/development/libraries/relibc/default.nix
+++ /dev/null
@@ -1,85 +0,0 @@
-{ lib, stdenvNoCC, buildPackages }:
-
-let
-  rpath = lib.makeLibraryPath [
-    buildPackages.stdenv.cc.libc
-    "$out"
-  ];
-  bootstrapCrossRust = stdenvNoCC.mkDerivation {
-    name = "binary-redox-rust";
-
-    src = buildPackages.fetchzip {
-      name = "redox-rust-toolchain.tar.gz";
-      url = "https://www.dropbox.com/s/qt7as0j7cwnin8z/redox-rust-toolchain.tar.gz?dl=1";
-      sha256 = "1g17qp2q6b88p04yclkw6amm374pqlakrmw9kd86vw8z4g70jkxm";
-    };
-
-    dontBuild = true;
-    dontPatchELF = true;
-    dontStrip = true;
-    installPhase = ''
-      mkdir $out/
-      cp -r * $out/
-
-      find $out/ -executable -type f -exec patchelf \
-          --set-interpreter "${buildPackages.stdenv.cc.libc}/lib/ld-linux-x86-64.so.2" \
-          --set-rpath "${rpath}" \
-          "{}" \;
-      find $out/ -name "*.so" -type f -exec patchelf \
-          --set-rpath "${rpath}" \
-          "{}" \;
-    '';
-
-    meta.platforms = with lib; platforms.redox ++ platforms.linux;
-  };
-
-  redoxRustPlatform = buildPackages.makeRustPlatform {
-    rustc = bootstrapCrossRust;
-    cargo = bootstrapCrossRust;
-  };
-
-in
-redoxRustPlatform.buildRustPackage rec {
-  pname = "relibc";
-  version = "latest";
-
-  LD_LIBRARY_PATH = "${buildPackages.zlib}/lib";
-
-  src = buildPackages.fetchgit {
-    url = "https://gitlab.redox-os.org/redox-os/relibc/";
-    rev = "5af8e3ca35ad401014a867ac1a0cc3b08dee682b";
-    sha256 = "1j4wsga9psl453031izkl3clkvm31d1wg4y8f3yqqvhml2aliws5";
-    fetchSubmodules = true;
-  };
-
-  RUSTC_BOOTSTRAP = 1;
-
-  dontInstall = true;
-  dontFixup = true;
-  doCheck = false;
-
-  postBuild = ''
-    mkdir -p $out
-    DESTDIR=$out make install
-  '';
-
-  TARGET = stdenvNoCC.hostPlatform.rust.rustcTargetSpec;
-
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "redox_syscall-0.2.0" = "sha256-nwbJBrhuc01fPbBgd5ShboNu0Nauqp2UjkA+sm9oCeE=";
-    };
-  };
-
-  # error: Usage of `RUSTC_WORKSPACE_WRAPPER` requires `-Z unstable-options`
-  auditable = false;
-
-  meta = with lib; {
-    homepage = "https://gitlab.redox-os.org/redox-os/relibc";
-    description = "C Library in Rust for Redox and Linux";
-    license = licenses.mit;
-    maintainers = [ maintainers.aaronjanse ];
-    platforms = platforms.redox ++ [ "x86_64-linux" ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 327ad752c650..507bc37caa19 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20351,8 +20351,6 @@ with pkgs;
     stdenv = crossLibcStdenv;
   };
 
-  relibc = callPackage ../development/libraries/relibc { };
-
   # Only supported on Linux and only on glibc
   glibcLocales =
     if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isGnu

From b9f1e80814d00487e6b11173636b5f86d580eb9d Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Mon, 2 Sep 2024 16:05:02 +0000
Subject: [PATCH 68/73] google-chrome: 128.0.6613.84 -> 128.0.6613.113

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

diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index 49b712351787..7947d4c606f3 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -164,11 +164,11 @@ let
 
   linux = stdenv.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "128.0.6613.84";
+    version = "128.0.6613.113";
 
     src = fetchurl {
       url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-4hABtHDq/8lIP6YbpU1VJdmgZNmLN2qb0VMPYw3dsBg=";
+      hash = "sha256-jdgZFmkPZwNt+4nb6/4ahCM4jNEKUkIfaI9MqOcjHys=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -256,11 +256,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "128.0.6613.85";
+    version = "128.0.6613.114";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/adnfqet5f4kxrux64zb25vwits5a_128.0.6613.85/GoogleChrome-128.0.6613.85.dmg";
-      hash = "sha256-mWTNwfMfCLPV+w1VCMUdv7lFtYSEVr4mnDgKURlDV3Q=";
+      url = "http://dl.google.com/release2/chrome/j7qfyaczqq4hpgxunewwclxnky_128.0.6613.114/GoogleChrome-128.0.6613.114.dmg";
+      hash = "sha256-6y99T+9abmUS9wKglNgPgj9M/cyLxb85rxpgCLxXR3E=";
     };
 
     dontPatch = true;

From 1502b62b9963eba78f9c91849174a8e936761c62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leiser=20Fern=C3=A1ndez=20Gallo?= <leiserfg@gmail.com>
Date: Mon, 2 Sep 2024 18:10:26 +0200
Subject: [PATCH 69/73] kitty: darwin-fix (#338033)

Copy nerdfont to avoid fc-match heuristic on mac
---
 pkgs/applications/terminal-emulators/kitty/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix
index 1b7484cf4b73..162d3cd583fd 100644
--- a/pkgs/applications/terminal-emulators/kitty/default.nix
+++ b/pkgs/applications/terminal-emulators/kitty/default.nix
@@ -84,7 +84,6 @@ buildPythonApplication rec {
     sphinx-inline-tabs
     go
     fontconfig
-    (nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];})
   ] ++ lib.optionals stdenv.isDarwin [
     imagemagick
     libicns  # For the png2icns tool.
@@ -137,6 +136,11 @@ buildPythonApplication rec {
     '';
   in ''
     runHook preBuild
+
+    # Add the font by hand because fontconfig does not finds it in darwin
+    mkdir ./fonts/
+    cp "${(nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];})}/share/fonts/truetype/NerdFonts/SymbolsNerdFontMono-Regular.ttf" ./fonts/
+
     ${ lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) "export MACOSX_DEPLOYMENT_TARGET=11" }
     ${if stdenv.isDarwin then ''
       ${python.pythonOnBuildForHost.interpreter} setup.py build ${darwinOptions}

From a5b7de6f2f42080a2b9fd4cdd2437ded7cef617e Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 1 Sep 2024 20:39:45 +0400
Subject: [PATCH 70/73] mapproxy: nixfmt-rfc-style

---
 pkgs/by-name/ma/mapproxy/package.nix | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/ma/mapproxy/package.nix b/pkgs/by-name/ma/mapproxy/package.nix
index 454e9329819a..f3d01c508577 100644
--- a/pkgs/by-name/ma/mapproxy/package.nix
+++ b/pkgs/by-name/ma/mapproxy/package.nix
@@ -1,15 +1,16 @@
-{ lib
-, python3
-, fetchPypi
+{
+  lib,
+  python3,
+  fetchPypi,
 }:
 
 with python3.pkgs;
 buildPythonApplication rec {
-  pname = "MapProxy";
+  pname = "mapproxy";
   version = "3.0.1";
   src = fetchPypi {
-  inherit pname version;
-  hash = "sha256-2So0e5VDWde33bNksdhzdaiOp4XkHcyULeBifV5OtKM=";
+    inherit pname version;
+    hash = "sha256-2So0e5VDWde33bNksdhzdaiOp4XkHcyULeBifV5OtKM=";
   };
   prePatch = ''
     substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv"
@@ -34,9 +35,9 @@ buildPythonApplication rec {
   doCheck = false;
 
   meta = {
-  description = "Open source proxy for geospatial data";
-  homepage = "https://mapproxy.org/";
-  license = lib.licenses.asl20;
-  maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ rakesh4g ]);
+    description = "Open source proxy for geospatial data";
+    homepage = "https://mapproxy.org/";
+    license = lib.licenses.asl20;
+    maintainers = lib.teams.geospatial.members ++ (with lib.maintainers; [ rakesh4g ]);
   };
 }

From ab77074b9616d3f93cef4745c99156953a2b077f Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 1 Sep 2024 21:25:37 +0400
Subject: [PATCH 71/73] mapproxy: fix dependencies

---
 pkgs/by-name/ma/mapproxy/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ma/mapproxy/package.nix b/pkgs/by-name/ma/mapproxy/package.nix
index f3d01c508577..77b16300a5c6 100644
--- a/pkgs/by-name/ma/mapproxy/package.nix
+++ b/pkgs/by-name/ma/mapproxy/package.nix
@@ -15,8 +15,11 @@ buildPythonApplication rec {
   prePatch = ''
     substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv"
   '';
-  propagatedBuildInputs = [
+
+  dependencies = [
     boto3 # needed for caches service
+    future
+    jsonschema
     pillow
     pyyaml
     pyproj
@@ -24,6 +27,7 @@ buildPythonApplication rec {
     gdal
     lxml
     setuptools
+    werkzeug
   ];
   # Tests are disabled:
   # 1) Dependency list is huge.

From d47fe12b69909831ae289175352721815cf4f18d Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 1 Sep 2024 21:33:47 +0400
Subject: [PATCH 72/73] mapproxy: switch from fetchPypi to fetchFromGitHub

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

diff --git a/pkgs/by-name/ma/mapproxy/package.nix b/pkgs/by-name/ma/mapproxy/package.nix
index 77b16300a5c6..ef39151c0104 100644
--- a/pkgs/by-name/ma/mapproxy/package.nix
+++ b/pkgs/by-name/ma/mapproxy/package.nix
@@ -1,17 +1,21 @@
 {
   lib,
   python3,
-  fetchPypi,
+  fetchFromGitHub,
 }:
 
 with python3.pkgs;
 buildPythonApplication rec {
   pname = "mapproxy";
   version = "3.0.1";
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-2So0e5VDWde33bNksdhzdaiOp4XkHcyULeBifV5OtKM=";
+
+  src = fetchFromGitHub {
+    owner = "mapproxy";
+    repo = "mapproxy";
+    rev = version;
+    hash = "sha256-74hUJIy1+DaKjUsCgd4+2MdMPGqqDUuHDrhBCFNn8Dk=";
   };
+
   prePatch = ''
     substituteInPlace mapproxy/util/ext/serving.py --replace "args = [sys.executable] + sys.argv" "args = sys.argv"
   '';

From 858c3f608101f27246f061d0f0e60917b07b1d3b Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 2 Sep 2024 12:18:45 +0200
Subject: [PATCH 73/73] openssl: fix building for riscv32-linux

Prior to 3.2, there's no linux32-riscv32 target, so we use
linux-latomic as a best approximation in that case.
---
 pkgs/development/libraries/openssl/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 160b740a72ed..f3f5fad15ff5 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -87,6 +87,7 @@ let
         x86_64-linux = "./Configure linux-x86_64";
         x86_64-solaris = "./Configure solaris64-x86_64-gcc";
         powerpc64-linux = "./Configure linux-ppc64";
+        riscv32-linux = "./Configure ${if lib.versionAtLeast version "3.2" then "linux32-riscv32" else "linux-latomic"}";
         riscv64-linux = "./Configure linux64-riscv64";
       }.${stdenv.hostPlatform.system} or (
         if stdenv.hostPlatform == stdenv.buildPlatform