From 1144d46f9510b8c31d0195e8049caa0df3eb3fec Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Thu, 25 Jul 2024 18:53:17 +0300
Subject: [PATCH 01/44] treewide: Rename android `sdkVer` and `ndkVer`

`sdkVer` conflicts with the old `sdkVer`(now `darwinSdkVersion` but that still uses `sdkVer` if set) used by darwin

This shouldn't be an issue but due to `pkgs/development/interpreters/python/cpython/default.nix`
running `lib.filterAttrs (n: v: ! lib.isDerivation v && n != "passthruFun")` on it's inputs (2 of them are darwin only)
the `throw "Unsupported sdk...` in `pkgs/top-level/darwin-packages.nix` will be triggered.

After this change `pkgsCross.armv7a-android-prebuilt.python3.pythonOnBuildForHost` won't fail with
`error: Unsupported sdk: 33`

Issue was bisected to 3cb23cec239d4f73bb1b51f26ac7599384fdadd6
---
 lib/systems/examples.nix                         | 10 ++++------
 .../androidndk-pkgs/androidndk-pkgs.nix          | 16 ++++++++--------
 pkgs/stdenv/cross/default.nix                    |  2 +-
 pkgs/top-level/all-packages.nix                  |  2 +-
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 178536efb009..d582ecba2bed 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -60,23 +60,21 @@ rec {
   armv7a-android-prebuilt = {
     config = "armv7a-unknown-linux-androideabi";
     rust.rustcTarget = "armv7-linux-androideabi";
-    sdkVer = "33";
-    ndkVer = "26";
     useAndroidPrebuilt = true;
   } // platforms.armv7a-android;
 
   aarch64-android-prebuilt = {
     config = "aarch64-unknown-linux-android";
     rust.rustcTarget = "aarch64-linux-android";
-    sdkVer = "33";
-    ndkVer = "26";
+    androidSdkVersion = "33";
+    androidNdkVersion = "26";
     useAndroidPrebuilt = true;
   };
 
   aarch64-android = {
     config = "aarch64-unknown-linux-android";
-    sdkVer = "33";
-    ndkVer = "26";
+    androidSdkVersion = "33";
+    androidNdkVersion = "26";
     libc = "bionic";
     useAndroidPrebuilt = false;
     useLLVM = true;
diff --git a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
index ccf8b4591d38..1355323d93fd 100644
--- a/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
+++ b/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix
@@ -44,7 +44,7 @@ let
   buildInfo = ndkBuildInfoFun stdenv.buildPlatform;
   targetInfo = ndkTargetInfoFun stdenv.targetPlatform;
 
-  inherit (stdenv.targetPlatform) sdkVer;
+  androidSdkVersion = if (stdenv.targetPlatform ? androidSdkVersion && stdenv.targetPlatform.androidSdkVersion != null) then stdenv.targetPlatform.androidSdkVersion else (throw "`androidSdkVersion` is not set during the importing of nixpkgs");
   suffixSalt = lib.replaceStrings ["-" "."] ["_" "_"] stdenv.targetPlatform.config;
 
   # targetInfo.triple is what Google thinks the toolchain should be, this is a little
@@ -77,8 +77,8 @@ rec {
       cp -r ${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/${buildInfo.double} $out/toolchain
       find $out/toolchain -type d -exec chmod 777 {} \;
 
-      if [ ! -d $out/toolchain/sysroot/usr/lib/${targetInfo.triple}/${sdkVer} ]; then
-        echo "NDK does not contain libraries for SDK version ${sdkVer}";
+      if [ ! -d $out/toolchain/sysroot/usr/lib/${targetInfo.triple}/${androidSdkVersion} ]; then
+        echo "NDK does not contain libraries for SDK version ${androidSdkVersion}";
         exit 1
       fi
 
@@ -86,8 +86,8 @@ rec {
       ln -s $out/toolchain/sysroot/usr/lib/${targetInfo.triple}/*.so $out/lib/
       ln -s $out/toolchain/sysroot/usr/lib/${targetInfo.triple}/*.a $out/lib/
       chmod +w $out/lib/*
-      ln -s $out/toolchain/sysroot/usr/lib/${targetInfo.triple}/${sdkVer}/*.so $out/lib/
-      ln -s $out/toolchain/sysroot/usr/lib/${targetInfo.triple}/${sdkVer}/*.o $out/lib/
+      ln -s $out/toolchain/sysroot/usr/lib/${targetInfo.triple}/${androidSdkVersion}/*.so $out/lib/
+      ln -s $out/toolchain/sysroot/usr/lib/${targetInfo.triple}/${androidSdkVersion}/*.o $out/lib/
 
       echo "INPUT(-lc++_static)" > $out/lib/libc++.a
 
@@ -130,7 +130,7 @@ rec {
     bintools = binutils;
     libc = targetAndroidndkPkgs.libraries;
     extraBuildCommands = ''
-      echo "-D__ANDROID_API__=${stdenv.targetPlatform.sdkVer}" >> $out/nix-support/cc-cflags
+      echo "-D__ANDROID_API__=${stdenv.targetPlatform.androidSdkVersion}" >> $out/nix-support/cc-cflags
       # Android needs executables linked with -pie since version 5.0
       # Use -fPIC for compilation, and link with -pie if no -shared flag used in ldflags
       echo "-target ${targetInfo.triple} -fPIC" >> $out/nix-support/cc-cflags
@@ -151,9 +151,9 @@ rec {
   # cross-compiling packages to wrap incorrectly wrap binaries we don't include
   # anyways.
   libraries = runCommand "bionic-prebuilt" {} ''
-    lpath=${buildAndroidndk}/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/${buildInfo.double}/sysroot/usr/lib/${targetInfo.triple}/${sdkVer}
+    lpath=${buildAndroidndk}/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/${buildInfo.double}/sysroot/usr/lib/${targetInfo.triple}/${androidSdkVersion}
     if [ ! -d $lpath ]; then
-      echo "NDK does not contain libraries for SDK version ${sdkVer} <$lpath>"
+      echo "NDK does not contain libraries for SDK version ${androidSdkVersion} <$lpath>"
       exit 1
     fi
     mkdir -p $out/lib
diff --git a/pkgs/stdenv/cross/default.nix b/pkgs/stdenv/cross/default.nix
index 1cbbfeb6d202..8aa83b8aa858 100644
--- a/pkgs/stdenv/cross/default.nix
+++ b/pkgs/stdenv/cross/default.nix
@@ -64,7 +64,7 @@ in lib.init bootStages ++ [
         cc = if crossSystem.useiOSPrebuilt or false
                then buildPackages.darwin.iosSdkPkgs.clang
              else if crossSystem.useAndroidPrebuilt or false
-               then buildPackages."androidndkPkgs_${crossSystem.ndkVer}".clang
+               then buildPackages."androidndkPkgs_${crossSystem.androidNdkVersion}".clang
              else if targetPlatform.isGhcjs
                # Need to use `throw` so tryEval for splicing works, ugh.  Using
                # `null` or skipping the attribute would cause an eval failure
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c4e1e27ac3d5..244d93dc8dca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -19857,7 +19857,7 @@ with pkgs;
 
   # TODO(@Ericson2314): Build bionic libc from source
   bionic = if stdenv.hostPlatform.useAndroidPrebuilt
-    then pkgs."androidndkPkgs_${stdenv.hostPlatform.ndkVer}".libraries
+    then pkgs."androidndkPkgs_${stdenv.hostPlatform.androidNdkVer}".libraries
     else callPackage ../os-specific/linux/bionic-prebuilt { };
 
   boolstuff = callPackage ../development/libraries/boolstuff { };

From 35e5943d69e0bfd7d3f265bf91f27b3c32b41d1b Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Thu, 25 Jul 2024 20:09:42 +0300
Subject: [PATCH 02/44] lib.systems: throw if `sdkVer` or `ndkVer` are used for
 android.

Those attrs have been renamed and throwing is the best way to show it,
if we only warned then the user would only get an error like this `error: Unsupported sdk: 33`
from `pkgs/top-level/darwin-packages.nix`.

If someone wants to support multiple NixOS versions then they can simply
set both attrs. (`!args ? androidSdkVersion` is for that)
---
 lib/systems/default.nix  | 16 ++++++++++++++++
 lib/systems/examples.nix |  2 ++
 2 files changed, 18 insertions(+)

diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index 0b8aeda208e3..65b85c8443e8 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -257,6 +257,22 @@ let
         if final.isMacOS then "MACOSX_DEPLOYMENT_TARGET"
         else if final.isiOS then "IPHONEOS_DEPLOYMENT_TARGET"
         else null;
+
+      # Remove before 25.05
+      androidSdkVersion =
+        if (args ? sdkVer && !args ? androidSdkVersion) then
+          throw "For android `sdkVer` has been renamed to `androidSdkVersion`"
+        else if (args ? androidSdkVersion) then
+          args.androidSdkVersion
+        else
+          null;
+      androidNdkVersion =
+        if (args ? ndkVer && !args ? androidNdkVersion) then
+          throw "For android `ndkVer` has been renamed to `androidNdkVersion`"
+        else if (args ? androidSdkVersion) then
+          args.androidNdkVersion
+        else
+          null;
     } // (
       let
         selectEmulator = pkgs:
diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index d582ecba2bed..971f6b87364b 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -60,6 +60,8 @@ rec {
   armv7a-android-prebuilt = {
     config = "armv7a-unknown-linux-androideabi";
     rust.rustcTarget = "armv7-linux-androideabi";
+    androidSdkVersion = "33";
+    androidNdkVersion = "26";
     useAndroidPrebuilt = true;
   } // platforms.armv7a-android;
 

From 3c6109c6883941c7e07e5d8593c98e901b1093df Mon Sep 17 00:00:00 2001
From: DrymarchonShaun <40149778+DrymarchonShaun@users.noreply.github.com>
Date: Wed, 3 Jul 2024 14:50:06 -0700
Subject: [PATCH 03/44] maintainers: add DrymarchonShaun

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 1d81e1129ea6..bb114ecefbe3 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5436,6 +5436,12 @@
     githubId = 252042;
     keys = [ { fingerprint = "85F3 72DF 4AF3 EF13 ED34  72A3 0AAF 2901 E804 0715"; } ];
   };
+  DrymarchonShaun = {
+    name = "Shaun";
+    email = "drymarchonshaun@protonmail.com";
+    github = "DrymarchonShaun";
+    githubId = 40149778;
+  };
   dsalaza4 = {
     email = "podany270895@gmail.com";
     github = "dsalaza4";

From 37671895b59d8c26c23c6682f2bda62c128969cc Mon Sep 17 00:00:00 2001
From: DrymarchonShaun <40149778+DrymarchonShaun@users.noreply.github.com>
Date: Wed, 3 Jul 2024 15:21:46 -0700
Subject: [PATCH 04/44] arma3-unix-launcher: init at 413

---
 .../disable_steam_integration.patch           |  25 ++++
 .../dont_fetch_dependencies.patch             | 115 ++++++++++++++++++
 .../ar/arma3-unix-launcher/package.nix        |  88 ++++++++++++++
 3 files changed, 228 insertions(+)
 create mode 100644 pkgs/by-name/ar/arma3-unix-launcher/disable_steam_integration.patch
 create mode 100644 pkgs/by-name/ar/arma3-unix-launcher/dont_fetch_dependencies.patch
 create mode 100644 pkgs/by-name/ar/arma3-unix-launcher/package.nix

diff --git a/pkgs/by-name/ar/arma3-unix-launcher/disable_steam_integration.patch b/pkgs/by-name/ar/arma3-unix-launcher/disable_steam_integration.patch
new file mode 100644
index 000000000000..556c384d5e2f
--- /dev/null
+++ b/pkgs/by-name/ar/arma3-unix-launcher/disable_steam_integration.patch
@@ -0,0 +1,25 @@
+diff --git a/src/arma3-unix-launcher/mainwindow.cpp b/src/arma3-unix-launcher/mainwindow.cpp
+index 66b73cc..f89f66b 100644
+--- a/src/arma3-unix-launcher/mainwindow.cpp
++++ b/src/arma3-unix-launcher/mainwindow.cpp
+@@ -56,6 +56,3 @@ MainWindow::MainWindow(std::unique_ptr<ARMA3::Client> arma3_client, std::filesys
+ {
+-    if (use_steam_integration)
+-        steam_integration = std::make_unique<Steam::SteamIntegration>(ARMA3::Definitions::app_id);
+-    else
+-        steam_integration = std::make_unique<Steam::IntegrationStub>(ARMA3::Definitions::app_id);
++    steam_integration = std::make_unique<Steam::IntegrationStub>(ARMA3::Definitions::app_id);
+ 
+diff --git a/src/dayz-linux-launcher/mainwindow.cpp b/src/dayz-linux-launcher/mainwindow.cpp
+index d9223db..5773593 100644
+--- a/src/dayz-linux-launcher/mainwindow.cpp
++++ b/src/dayz-linux-launcher/mainwindow.cpp
+@@ -56,6 +56,3 @@ MainWindow::MainWindow(std::unique_ptr<DayZ::Client> arma3_client, std::filesyst
+ {
+-    if (use_steam_integration)
+-        steam_integration = std::make_unique<Steam::SteamIntegration>(DayZ::Definitions::app_id);
+-    else
+-        steam_integration = std::make_unique<Steam::IntegrationStub>(DayZ::Definitions::app_id);
++    steam_integration = std::make_unique<Steam::IntegrationStub>(DayZ::Definitions::app_id);
+ 
+
diff --git a/pkgs/by-name/ar/arma3-unix-launcher/dont_fetch_dependencies.patch b/pkgs/by-name/ar/arma3-unix-launcher/dont_fetch_dependencies.patch
new file mode 100644
index 000000000000..947a790c38df
--- /dev/null
+++ b/pkgs/by-name/ar/arma3-unix-launcher/dont_fetch_dependencies.patch
@@ -0,0 +1,115 @@
+diff --git a/cmake/external_dependencies.cmake b/cmake/external_dependencies.cmake
+index 2eb6ec5..9f1d67e 100644
+--- a/cmake/external_dependencies.cmake
++++ b/cmake/external_dependencies.cmake
+@@ -4,7 +4,7 @@ include(FetchContent)
+ 
+ function(setup_library SOURCE_TO_TEST)
+     set(boolArgs HEADER_ONLY)
+-    set(oneValueArgs NAME CXX_FLAGS GIT_REPOSITORY GIT_TAG TEST_DEFINITIONS TEST_LINK_LIBS)
++    set(oneValueArgs NAME CXX_FLAGS URL GIT_TAG TEST_DEFINITIONS TEST_LINK_LIBS)
+     set(multiValueArgs WHEN)
+     cmake_parse_arguments(LIB_SETUP "${boolArgs}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+ 
+@@ -27,12 +27,11 @@ function(setup_library SOURCE_TO_TEST)
+     endif()
+ 
+     FetchContent_Declare(${LIB_SETUP_NAME}
+-                         GIT_REPOSITORY ${LIB_SETUP_GIT_REPOSITORY}
+-                         GIT_TAG ${LIB_SETUP_GIT_TAG})
++        URL ${LIB_SETUP_URL})
+     FetchContent_GetProperties(${LIB_SETUP_NAME})
+     set(POPULATED "${LIB_SETUP_NAME}_POPULATED")
+     if (NOT "${POPULATED}")
+-        message("-- Downloading ${LIB_SETUP_NAME} from ${LIB_SETUP_GIT_REPOSITORY}")
++        message("-- Downloading ${LIB_SETUP_NAME} from ${LIB_SETUP_URL}")
+         FetchContent_Populate(${LIB_SETUP_NAME})
+         set(SRCDIR "${LIB_SETUP_NAME}_SOURCE_DIR")
+         set(BINDIR "${LIB_SETUP_NAME}_BINARY_DIR")
+@@ -51,8 +50,7 @@ function(setup_argparse)
+             }")
+     setup_library("${CHECK_SOURCE}"
+                   NAME argparse
+-                  GIT_REPOSITORY https://github.com/p-ranav/argparse.git
+-                  GIT_TAG 45664c4
++                  URL @argparse_src@
+                   HEADER_ONLY
+                   )
+     if (NOT TARGET argparse::argparse)
+@@ -64,7 +62,7 @@ function(setup_curlpp)
+     set(CHECK_SOURCE "#error unimplemented}")
+     setup_library("${CHECK_SOURCE}"
+                   NAME curlpp
+-                  GIT_REPOSITORY https://github.com/jpbarrette/curlpp.git
++                  URL @curlpp_src@
+                   )
+     if (NOT APPLE)
+         set(CURLPP_LIB_PATH1 "${curlpp_BINARY_DIR}/libcurlpp.so" PARENT_SCOPE)
+@@ -79,7 +77,7 @@ function(setup_doctest)
+                       #include <doctest/doctest.h>")
+     setup_library("${CHECK_SOURCE}"
+                   NAME doctest
+-                  GIT_REPOSITORY https://github.com/onqtam/doctest.git
++                  URL @doctest_src@
+                   HEADER_ONLY
+                   )
+     add_library(doctest::doctest ALIAS doctest)
+@@ -100,8 +98,7 @@ function(setup_fmt)
+         }")
+     setup_library("${CHECK_SOURCE}"
+                   NAME fmt
+-                  GIT_REPOSITORY https://github.com/fmtlib/fmt.git
+-                  GIT_TAG 8.1.1
++                  URL @fmt_src@
+                   TEST_LINK_LIBS fmt
+                   )
+ 
+@@ -126,7 +123,7 @@ function(setup_nlohmann_json)
+         add_library(nlohmann_json INTERFACE)
+     else()
+         FetchContent_Declare(nlohmann_json
+-                             URL https://github.com/nlohmann/json/releases/download/v3.7.3/include.zip)
++                             URL @nlohmann_json_src@)
+         FetchContent_GetProperties(nlohmann_json)
+         if (NOT nlohmann_json_POPULATED)
+             FetchContent_Populate(nlohmann_json)
+@@ -146,8 +143,7 @@ function(setup_pugixml)
+         }")
+     setup_library("${CHECK_SOURCE}"
+                   NAME pugixml
+-                  GIT_REPOSITORY https://github.com/muttleyxd/pugixml.git
+-                  GIT_TAG simple-build-for-a3ul
++                  URL @pugixml_src@
+                   TEST_LINK_LIBS pugixml
+                   )
+     get_target_property(TARGET_TYPE pugixml TYPE)
+@@ -188,8 +184,7 @@ function(setup_spdlog)
+ 
+     setup_library("${CHECK_SOURCE}"
+                   NAME spdlog
+-                  GIT_REPOSITORY https://github.com/gabime/spdlog.git
+-                  GIT_TAG v1.x
++                  URL @spdlog_src@
+                   TEST_DEFINITIONS -DSPDLOG_FMT_EXTERNAL
+                   TEST_LINK_LIBS ${FMT_TARGET_NAME}
+                   CXX_FLAGS "-Wno-attributes -Wno-reorder -Wno-redundant-move"
+@@ -198,8 +193,7 @@ endfunction()
+ 
+ function(setup_steamworkssdk)
+     FetchContent_Declare(steamworkssdk
+-        URL https://github.com/julianxhokaxhiu/SteamworksSDKCI/releases/download/1.53/SteamworksSDK-v1.53.0_x64.zip
+-        URL_HASH MD5=322c2c90c3ab76201c92f4a2c443f664
++        URL @steamworkssdk_src@
+         CONFIGURE_COMMAND ""
+         BUILD_COMMAND ""
+         )
+@@ -241,8 +235,7 @@ function(setup_trompeloeil)
+                       int main() { }")
+     setup_library("${CHECK_SOURCE}"
+                   NAME trompeloeil
+-                  GIT_REPOSITORY https://github.com/rollbear/trompeloeil.git
+-                  GIT_TAG 64fd171
++                  URL @trompeloeil_src@
+                   HEADER_ONLY
+                   )
+     add_library(trompeloeil::trompeloeil ALIAS trompeloeil)
diff --git a/pkgs/by-name/ar/arma3-unix-launcher/package.nix b/pkgs/by-name/ar/arma3-unix-launcher/package.nix
new file mode 100644
index 000000000000..49c4e98ceb05
--- /dev/null
+++ b/pkgs/by-name/ar/arma3-unix-launcher/package.nix
@@ -0,0 +1,88 @@
+{
+  lib,
+  stdenv,
+  cmake,
+  curl,
+  curlpp,
+  doctest,
+  fetchFromGitHub,
+  fetchurl,
+  fmt,
+  nlohmann_json,
+  qt5,
+  spdlog,
+  substituteAll,
+  trompeloeil,
+  buildDayZLauncher ? false,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "arma3-unix-launcher";
+  version = "413";
+
+  src = fetchFromGitHub {
+    owner = "muttleyxd";
+    repo = "arma3-unix-launcher";
+    rev = "2ea62d961522f1542d4c8e669ef5fe856916f9ec";
+    hash = "sha256-uym93mYmVj9UxT8RbwdRUyIPrQX7nZTNWUUVjxCQmVU=";
+  };
+
+  patches = [
+    # prevent CMake from trying to get libraries on the internet
+    (substituteAll {
+      src = ./dont_fetch_dependencies.patch;
+      argparse_src = fetchFromGitHub {
+        owner = "p-ranav";
+        repo = "argparse";
+        rev = "45664c4e9f05ff287731a9ff8b724d0c89fb6e77";
+        sha256 = "sha256-qLD9zD6hbItDn6ZHHWBXrAWhySvqcs40xA5+C/5Fkhw=";
+      };
+      curlpp_src = curlpp.src;
+      doctest_src = doctest;
+      fmt_src = fmt;
+      nlohmann_json_src = nlohmann_json;
+      pugixml_src = fetchFromGitHub {
+        owner = "muttleyxd";
+        repo = "pugixml";
+        rev = "simple-build-for-a3ul";
+        sha256 = "sha256-FpREdz6DbhnLDGOuQY9rU17SSd6ngA4WfO0kGHqGJPM=";
+      };
+      spdlog_src = spdlog;
+      steamworkssdk_src = fetchurl {
+        url = "https://github.com/julianxhokaxhiu/SteamworksSDKCI/releases/download/1.53/SteamworksSDK-v1.53.0_x64.zip";
+        sha256 = "sha256-6PQGaPsaxBg/MHVWw2ynYW6LaNSrE9Rd9Q9ZLKFGPFA=";
+      };
+      trompeloeil_src = trompeloeil;
+    })
+    # game won't launch with steam integration anyways, disable it
+    ./disable_steam_integration.patch
+  ];
+
+  nativeBuildInputs = [
+    qt5.wrapQtAppsHook
+    cmake
+  ];
+
+  buildInputs = [
+    spdlog
+    curlpp.src
+    curl
+    qt5.qtbase
+    qt5.qtsvg
+  ];
+
+  cmakeFlags = [ "-Wno-dev" ] ++ lib.optionals buildDayZLauncher [ "-DBUILD_DAYZ_LAUNCHER=ON" ];
+
+  meta = {
+    homepage = "https://github.com/muttleyxd/arma3-unix-launcher/";
+    description = "Clean, intuitive Arma 3 + DayZ SA Launcher";
+    license = with lib.licenses; [
+      # Launcher
+      mit
+      # Steamworks SDK
+      unfree
+    ];
+    maintainers = with lib.maintainers; [ DrymarchonShaun ];
+    mainProgram = "arma3-unix-launcher";
+    platforms = with lib.platforms; linux ++ darwin;
+  };
+})

From 80c274d0c8e4c18ecab4c6c38ccb253c6483add7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 12 Aug 2024 07:05:54 +0000
Subject: [PATCH 05/44] networkmanager: 1.48.6 -> 1.48.8

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

diff --git a/pkgs/tools/networking/networkmanager/default.nix b/pkgs/tools/networking/networkmanager/default.nix
index 9a3e039267b6..8f18bfd3cdaa 100644
--- a/pkgs/tools/networking/networkmanager/default.nix
+++ b/pkgs/tools/networking/networkmanager/default.nix
@@ -60,11 +60,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "networkmanager";
-  version = "1.48.6";
+  version = "1.48.8";
 
   src = fetchurl {
     url = "mirror://gnome/sources/NetworkManager/${lib.versions.majorMinor version}/NetworkManager-${version}.tar.xz";
-    hash = "sha256-5lxJbgZjGkl3x5XA8khZjDnDQOVjXXz1TsMHKsyZiZU=";
+    hash = "sha256-YgDqyPHT/mo+ofLEFYs8lbO5+R50zXBOl7CwUbWlSHg=";
   };
 
   outputs = [ "out" "dev" "devdoc" "man" "doc" ];

From d1454ba75fd4abdee1a4a7d32f73233b51cb1d3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <mail@dotlambda.de>
Date: Tue, 13 Aug 2024 06:47:25 -0700
Subject: [PATCH 06/44] python312Packages.imageio-ffmpeg: cleanup

---
 pkgs/development/python-modules/imageio-ffmpeg/default.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/imageio-ffmpeg/default.nix b/pkgs/development/python-modules/imageio-ffmpeg/default.nix
index 250f5ea64b18..b000d560a56f 100644
--- a/pkgs/development/python-modules/imageio-ffmpeg/default.nix
+++ b/pkgs/development/python-modules/imageio-ffmpeg/default.nix
@@ -29,15 +29,10 @@ buildPythonPackage rec {
   patches = [
     (substituteAll {
       src = ./ffmpeg-path.patch;
-      ffmpeg = "${ffmpeg}/bin/ffmpeg";
+      ffmpeg = lib.getExe ffmpeg;
     })
   ];
 
-  # https://github.com/imageio/imageio-ffmpeg/issues/59
-  postPatch = ''
-    sed -i '/setup_requires=\["pip>19"\]/d' setup.py
-  '';
-
   build-system = [ setuptools ];
 
   nativeCheckInputs = [

From 6796b81f05e8c09a9852469a13fc5c36075a88d5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 14 Aug 2024 09:06:40 +0000
Subject: [PATCH 07/44] python312Packages.inform: 1.30 -> 1.31

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

diff --git a/pkgs/development/python-modules/inform/default.nix b/pkgs/development/python-modules/inform/default.nix
index e4397954dd66..ab08f740e674 100644
--- a/pkgs/development/python-modules/inform/default.nix
+++ b/pkgs/development/python-modules/inform/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "inform";
-  version = "1.30";
+  version = "1.31";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "KenKundert";
     repo = "inform";
     rev = "refs/tags/v${version}";
-    hash = "sha256-6Yx9ZdmrFApJ6zBiC8Q++hlATVqjriJLS2KsqC0IBCk=";
+    hash = "sha256-o7yH7jCNn9gbcr7NMJVaYQOJ7hvwaY2ur1FyEP40Cco=";
   };
 
   nativeBuildInputs = [ flit-core ];

From 092f60c7ef1f7d6e5d7014e7c47f23579f2c2ac3 Mon Sep 17 00:00:00 2001
From: Sascha Grunert <sgrunert@redhat.com>
Date: Thu, 8 Aug 2024 10:14:11 +0200
Subject: [PATCH 08/44] cri-tools: 1.30.1 -> 1.31.1

Signed-off-by: Sascha Grunert <sgrunert@redhat.com>
---
 pkgs/tools/virtualization/cri-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/virtualization/cri-tools/default.nix b/pkgs/tools/virtualization/cri-tools/default.nix
index b04305c90702..8b87a2de6ecb 100644
--- a/pkgs/tools/virtualization/cri-tools/default.nix
+++ b/pkgs/tools/virtualization/cri-tools/default.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "cri-tools";
-  version = "1.30.1";
+  version = "1.31.1";
 
   src = fetchFromGitHub {
     owner = "kubernetes-sigs";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-mCBGLnNlAfq7qThsbsGsBSEJEI85fg0xAbFENyIRyBU=";
+    hash = "sha256-ruhWuBpPjc0dX7kgiTBFFHriSGYx4XoMNv+M39aIh10=";
   };
 
   vendorHash = null;

From 22a226250888635093cab1fc4b4a1cd78e79749a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 14 Aug 2024 18:41:07 +0000
Subject: [PATCH 09/44] pdm: 2.17.3 -> 2.18.0

---
 pkgs/tools/package-management/pdm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/pdm/default.nix b/pkgs/tools/package-management/pdm/default.nix
index 347a78b9af85..c7856bde2796 100644
--- a/pkgs/tools/package-management/pdm/default.nix
+++ b/pkgs/tools/package-management/pdm/default.nix
@@ -11,14 +11,14 @@
 with python3.pkgs;
 buildPythonApplication rec {
   pname = "pdm";
-  version = "2.17.3";
+  version = "2.18.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-9JIg8iXscSWMv3FIsUp2yurGEnRb7atn+QYjmOpWp6U=";
+    hash = "sha256-+WP48VWMD/lNrYK54xIS1V0MWdIVIH4PXgQG1Bsql9w=";
   };
 
   nativeBuildInputs = [

From 394af6c3078f98d0e30834e0e28e156e802a008e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 15 Aug 2024 03:08:15 +0000
Subject: [PATCH 10/44] python312Packages.pbs-installer: 2024.4.24 ->
 2024.08.14

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

diff --git a/pkgs/development/python-modules/pbs-installer/default.nix b/pkgs/development/python-modules/pbs-installer/default.nix
index fb0068dd31a6..8ab7896ea0d1 100644
--- a/pkgs/development/python-modules/pbs-installer/default.nix
+++ b/pkgs/development/python-modules/pbs-installer/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pbs-installer";
-  version = "2024.4.24";
+  version = "2024.08.14";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "frostming";
     repo = "pbs-installer";
     rev = "refs/tags/${version}";
-    hash = "sha256-a35xQEdo7OOFlXk2vsTdVpEhqPRKFZRQzNnZw3c7ybA=";
+    hash = "sha256-Hitd7Ze8pujkRBoTapP5SekpdiDwJz/0UNe0wW7eaRA=";
   };
 
   build-system = [ pdm-backend ];

From 7199f9763ee9417069652928c23eb06a5e3045ee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 15 Aug 2024 17:24:06 +0000
Subject: [PATCH 11/44] python312Packages.quantile-forest: 1.3.7 -> 1.3.8

---
 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 4cd74184b89f..3f2e4979f192 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.7";
+  version = "1.3.8";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "zillow";
     repo = "quantile-forest";
     rev = "refs/tags/v${version}";
-    hash = "sha256-3EcluHUDtAYfaHycgyCAaolRcChecrPRnMaUFrpzMIQ=";
+    hash = "sha256-/BY34xxEWpmUcbITBUX2nGZ8ZOjKDPwiA6Vui0CvsBc=";
   };
 
   build-system = [

From 6ac1b21e049f1fbec876aa118ad34f6d716b5445 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Thu, 15 Aug 2024 19:57:23 +0200
Subject: [PATCH 12/44] got: 0.101 -> 0.102

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

diff --git a/pkgs/by-name/go/got/package.nix b/pkgs/by-name/go/got/package.nix
index 0f1432d4cc21..942e758972ff 100644
--- a/pkgs/by-name/go/got/package.nix
+++ b/pkgs/by-name/go/got/package.nix
@@ -27,11 +27,11 @@ let
 in
 stdenv'.mkDerivation (finalAttrs: {
   pname = "got";
-  version = "0.101";
+  version = "0.102";
 
   src = fetchurl {
     url = "https://gameoftrees.org/releases/portable/got-portable-${finalAttrs.version}.tar.gz";
-    hash = "sha256-JQZBgscxoMv4Dki77s8tYo4r5BBG+ErsDYnY5/am3MA=";
+    hash = "sha256-qstQ6mZLCdYL5uQauMt7nGlEdPkPneGfu36RbaboN3c=";
   };
 
   nativeBuildInputs = [ pkg-config bison ]

From 75245a6920bb86fbe7c12d4f2112934f52520e2b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 15 Aug 2024 18:39:10 +0000
Subject: [PATCH 13/44] regal: 0.24.0 -> 0.25.0

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

diff --git a/pkgs/by-name/re/regal/package.nix b/pkgs/by-name/re/regal/package.nix
index 883bc1743b3f..7372fac74436 100644
--- a/pkgs/by-name/re/regal/package.nix
+++ b/pkgs/by-name/re/regal/package.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   name = "regal";
-  version = "0.24.0";
+  version = "0.25.0";
 
   src = fetchFromGitHub {
     owner = "StyraInc";
     repo = "regal";
     rev = "v${version}";
-    hash = "sha256-bSu35IfQBoz2YKlEm8e02ahw9FxQfilR3b2WdjbAubs=";
+    hash = "sha256-yhlkvvNkZtpVx2uZVvXjr3eqBFXHDJ5qyO6k5EPNfww=";
   };
 
-  vendorHash = "sha256-2NzBcOQ1TLUsh8wKiGlPogql+6qNou8//XpCiE7eV5I=";
+  vendorHash = "sha256-gZYQEJAlm8qslHGfUsA8np43zdiPDYyhKm8HZIBR3ys=";
 
   meta = with lib; {
     description = "Linter and language server for Rego";

From b271b5102e4d4e8ccadd764ab9f96cf4fbe07c3a Mon Sep 17 00:00:00 2001
From: Lenivaya <danylo.osipchuk@proton.me>
Date: Fri, 16 Aug 2024 00:01:53 +0300
Subject: [PATCH 14/44] maintainers: add lenivaya

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a02b6f0be78f..34957e37570b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -11495,6 +11495,12 @@
     githubId = 31388299;
     name = "Leonardo Eugênio";
   };
+  lenivaya = {
+    name = "Danylo Osipchuk";
+    email = "danylo.osipchuk@proton.me";
+    github = "lenivaya";
+    githubId = 49302467;
+  };
   leo248 = {
     github = "leo248";
     githubId = 95365184;

From d3745a6e5f1f50081eee41516a35eedeb8659227 Mon Sep 17 00:00:00 2001
From: Lenivaya <danylo.osipchuk@proton.me>
Date: Fri, 16 Aug 2024 00:02:09 +0300
Subject: [PATCH 15/44] qrrs: init at 0.1.10

---
 pkgs/by-name/qr/qrrs/package.nix | 39 ++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 pkgs/by-name/qr/qrrs/package.nix

diff --git a/pkgs/by-name/qr/qrrs/package.nix b/pkgs/by-name/qr/qrrs/package.nix
new file mode 100644
index 000000000000..cc67cb167352
--- /dev/null
+++ b/pkgs/by-name/qr/qrrs/package.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  installShellFiles,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "qrrs";
+  version = "0.1.10";
+
+  src = fetchFromGitHub {
+    owner = "lenivaya";
+    repo = "qrrs";
+    rev = "v${version}";
+    sha256 = "sha256-L8sqvLbh85b8Ds9EvXNkyGVXm8BF3ejFd8ZH7QoxJdU=";
+  };
+
+  cargoHash = "sha256-RLxQ7tG5e3q4vqYJU0eNvvcEnnyNc9R9at0/ACLYJiY=";
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = ''
+    installManPage ./man/*.?
+
+
+    installShellCompletion --cmd qrrs \
+      --bash <(cat ./completions/qrrs.bash) \
+      --fish <(cat ./completions/qrrs.fish) \
+      --zsh <(cat ./completions/_qrrs)
+  '';
+
+  meta = with lib; {
+    maintainers = with maintainers; [ philiptaron ];
+    description = "CLI QR code generator and reader written in rust";
+    license = licenses.mit;
+    homepage = "https://github.com/Lenivaya/qrrs";
+    mainProgram = "qrrs";
+  };
+}

From c85c9a91f2d83e052a409c516209ea88d36ff944 Mon Sep 17 00:00:00 2001
From: Lenivaya <danylo.osipchuk@proton.me>
Date: Fri, 16 Aug 2024 01:11:49 +0300
Subject: [PATCH 16/44] fix: wrong maintainer

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

diff --git a/pkgs/by-name/qr/qrrs/package.nix b/pkgs/by-name/qr/qrrs/package.nix
index cc67cb167352..c995bf5a6b9a 100644
--- a/pkgs/by-name/qr/qrrs/package.nix
+++ b/pkgs/by-name/qr/qrrs/package.nix
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
   '';
 
   meta = with lib; {
-    maintainers = with maintainers; [ philiptaron ];
+    maintainers = with maintainers; [ lenivaya ];
     description = "CLI QR code generator and reader written in rust";
     license = licenses.mit;
     homepage = "https://github.com/Lenivaya/qrrs";

From 32292313f832933274382e511aa54405730365c5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 16 Aug 2024 04:07:17 +0000
Subject: [PATCH 17/44] nixf: 2.3.1 -> 2.3.2

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

diff --git a/pkgs/development/tools/language-servers/nixd/default.nix b/pkgs/development/tools/language-servers/nixd/default.nix
index 504eabcda0c9..b4736c0b6173 100644
--- a/pkgs/development/tools/language-servers/nixd/default.nix
+++ b/pkgs/development/tools/language-servers/nixd/default.nix
@@ -21,13 +21,13 @@
 
 let
   common = rec {
-    version = "2.3.1";
+    version = "2.3.2";
 
     src = fetchFromGitHub {
       owner = "nix-community";
       repo = "nixd";
       rev = version;
-      hash = "sha256-JmDMcxIQ0220O/vWw/9SyB1dH7MSJaPK/CKY44ViVjM=";
+      hash = "sha256-ffHLKHpqgVlYLGQ/Dc/6hW/inA98QdMJiv/fT2IrH7c=";
     };
 
     nativeBuildInputs = [

From b23f15e0c37ca136b34c7779a24f76cb542d18c4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 16 Aug 2024 07:04:59 +0000
Subject: [PATCH 18/44] python312Packages.prisma: 0.14.0 -> 0.15.0

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

diff --git a/pkgs/development/python-modules/prisma/default.nix b/pkgs/development/python-modules/prisma/default.nix
index 1f9b8dff5eeb..db89649a6a63 100644
--- a/pkgs/development/python-modules/prisma/default.nix
+++ b/pkgs/development/python-modules/prisma/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "prisma";
-  version = "0.14.0";
+  version = "0.15.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "RobertCraigie";
     repo = "prisma-client-py";
     rev = "refs/tags/v${version}";
-    hash = "sha256-PeKRH+6/D5/VxnhRFhpvtZ85OL8mJDhG7QLn4oRUvfE=";
+    hash = "sha256-F+Up1HHslralt3NvZZ/wT+CKvzKOjhEEuMEeT0L6NZM=";
   };
 
   build-system = [ setuptools ];

From 9981aded6c4bd42486966dc14d0d92868f760279 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 16 Aug 2024 07:19:30 +0000
Subject: [PATCH 19/44] python312Packages.nutils: 8.7 -> 8.8

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

diff --git a/pkgs/development/python-modules/nutils/default.nix b/pkgs/development/python-modules/nutils/default.nix
index 4495a40118be..f8ac839989fa 100644
--- a/pkgs/development/python-modules/nutils/default.nix
+++ b/pkgs/development/python-modules/nutils/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "nutils";
-  version = "8.7";
+  version = "8.8";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "evalf";
     repo = "nutils";
     rev = "refs/tags/v${version}";
-    hash = "sha256-wxouS0FXrdIhm6nTVBuzkwHceJnZ7f7k8nMFxFsZchE=";
+    hash = "sha256-E/y1YXW+0+LfntRQsdIU9rMOmN8mlFwXktD/sViJo3I=";
   };
 
   build-system = [ flit-core ];

From b20aec69df52ab4180452a5f3aa7077946165044 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 16 Aug 2024 09:20:10 +0000
Subject: [PATCH 20/44] emacsPackages.ligo-mode: 1.7.0-unstable-2024-08-01 ->
 1.7.0-unstable-2024-08-14

---
 .../elisp-packages/manual-packages/ligo-mode/package.nix    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix
index ed8dfd3cece8..045d3f759761 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ligo-mode/package.nix
@@ -8,13 +8,13 @@
 
 melpaBuild {
   pname = "ligo-mode";
-  version = "1.7.0-unstable-2024-08-01";
+  version = "1.7.0-unstable-2024-08-14";
 
   src = fetchFromGitLab {
     owner = "ligolang";
     repo = "ligo";
-    rev = "454e4a505212b8bd80ac3c75a1432320b9be2604";
-    hash = "sha256-Z7bv+ulGwnczrSWWC1RIUzSI4wAF9AtObdi5bBfYsOs=";
+    rev = "547da30202972fd9b5114ce82c4b94ddf6c8e8f7";
+    hash = "sha256-kGFV3Ci8F+vK1LCQCsdpxeoLHarfa4dItQkJDihE7eI=";
   };
 
   files = ''("tools/emacs/ligo-mode.el")'';

From 7962e05ea35f0f927a86dc6e86765309023e9b62 Mon Sep 17 00:00:00 2001
From: Sebastian Neubauer <Sebastian.Neubauer@amd.com>
Date: Fri, 16 Aug 2024 19:02:17 +0200
Subject: [PATCH 21/44] amdvlk: 2024.Q2.3 -> 2024.Q3.1

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

diff --git a/pkgs/development/libraries/amdvlk/default.nix b/pkgs/development/libraries/amdvlk/default.nix
index 6e3677431e78..5c58b837b305 100644
--- a/pkgs/development/libraries/amdvlk/default.nix
+++ b/pkgs/development/libraries/amdvlk/default.nix
@@ -25,13 +25,13 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "amdvlk";
-  version = "2024.Q2.3";
+  version = "2024.Q3.1";
 
   src = fetchRepoProject {
     name = "${pname}-src";
     manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
     rev = "refs/tags/v-${version}";
-    sha256 = "kNGJWuWN2B4hEyRz2JFGSE8TiIdxujBOxF/T6nNek0A=";
+    sha256 = "IZYv9ZfpIllYUhJ3f7AOFmSl7OfWWY8doaG8pe3GE+4=";
   };
 
   buildInputs = [

From ecb342fd4e5f6b44dad58453c123f62547f7fc63 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Fri, 16 Aug 2024 03:32:23 +0200
Subject: [PATCH 22/44] testers.testVersion: ignore echoed store paths

Fixes the error mode where the test always passes if the store path of the binary is echoed by the test command.
---
 pkgs/build-support/testers/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/testers/default.nix b/pkgs/build-support/testers/default.nix
index d0d88115003f..737c47bcc321 100644
--- a/pkgs/build-support/testers/default.nix
+++ b/pkgs/build-support/testers/default.nix
@@ -53,7 +53,7 @@
       command ? "${package.meta.mainProgram or package.pname or package.name} --version",
       version ? package.version,
     }: runCommand "${package.name}-test-version" { nativeBuildInputs = [ package ]; meta.timeout = 60; } ''
-      if output=$(${command} 2>&1); then
+      if output=$(${command} 2>&1 | sed -e 's|${builtins.storeDir}/[^/ ]*/|{{storeDir}}/|g'); then
         if grep -Fw -- "${version}" - <<< "$output"; then
           touch $out
         else

From 978ad609cd4a8e7cd261d5ed64fc8092bf0b6b19 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 14 Aug 2024 04:44:55 +0200
Subject: [PATCH 23/44] python311Packages.gradio: 4.40.0 -> 4.41.0

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

diff --git a/pkgs/development/python-modules/gradio/default.nix b/pkgs/development/python-modules/gradio/default.nix
index a25d8baa10d3..076bf7918920 100644
--- a/pkgs/development/python-modules/gradio/default.nix
+++ b/pkgs/development/python-modules/gradio/default.nix
@@ -47,6 +47,7 @@
 
   # check
   pytestCheckHook,
+  hypothesis,
   altair,
   boto3,
   gradio-pdf,
@@ -63,7 +64,7 @@
 
 buildPythonPackage rec {
   pname = "gradio";
-  version = "4.40.0";
+  version = "4.41.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -71,7 +72,7 @@ buildPythonPackage rec {
   # We use the Pypi release, since it provides prebuilt webui assets
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ChV5E6RfFcOwW6uFqU4/phfHfn27yS8+MKjMVytnlgU=";
+    hash = "sha256-d4li7kQFMzlUVGdm2nTSnj25pTOWIqnZuOvTOtwPLpc=";
   };
 
   # fix packaging.ParserSyntaxError, which can't handle comments
@@ -133,6 +134,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
+    hypothesis
     altair
     boto3
     gradio-pdf
@@ -187,6 +189,9 @@ buildPythonPackage rec {
 
     # flaky: OSError: Cannot find empty port in range: 7860-7959
     "test_docs_url"
+    "test_orjson_serialization"
+    "test_dataset_is_updated"
+    "test_multimodal_api"
 
     # tests if pip and other tools are installed
     "test_get_executable_path"
@@ -245,8 +250,8 @@ buildPythonPackage rec {
     "test/test_networking.py"
     # makes pytest freeze 50% of the time
     "test/test_interfaces.py"
-  ] ++ lib.optionals stdenv.isDarwin [
-    # Network-related tests that are flaky on darwin (depend on port availability)
+
+    # Local network tests dependant on port availability (port 7860-7959)
     "test/test_routes.py"
   ];
   pytestFlagsArray = [

From 0591a7e0b304e465de32416fceb3b474560de2f8 Mon Sep 17 00:00:00 2001
From: Dovydas Kersys <dovydas@kersys.lt>
Date: Fri, 16 Aug 2024 23:46:08 +0300
Subject: [PATCH 24/44] hyprpaper: 0.7.0 -> 0.7.1

---
 .../window-managers/hyprwm/hyprpaper/default.nix       | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix b/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix
index 17bf63a72753..8553f292dcec 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix
@@ -22,24 +22,25 @@
 , util-linux
 , wayland
 , wayland-protocols
-, wayland-scanner
+, hyprwayland-scanner
+, hyprutils
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hyprpaper";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprpaper";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-l13c8ALA7ZKDgluYA1C1OfkDGYD6e1/GR6LJnxCLRhA=";
+    hash = "sha256-HIK7XJWQCM0BAnwW5uC7P0e7DAkVTy5jlxQ0NwoSy4M=";
   };
 
   nativeBuildInputs = [
     cmake
     pkg-config
-    wayland-scanner
+    hyprwayland-scanner
   ];
 
   buildInputs = [
@@ -62,6 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
     util-linux
     wayland
     wayland-protocols
+    hyprutils
   ];
 
   prePatch = ''

From ef368289cebce3a9100d965f7a1542b9cc02b172 Mon Sep 17 00:00:00 2001
From: seth <getchoo@tuta.io>
Date: Sat, 6 Jul 2024 19:32:50 -0400
Subject: [PATCH 25/44] gdm-settings: init at 4.4

---
 pkgs/by-name/gd/gdm-settings/package.nix | 68 ++++++++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 pkgs/by-name/gd/gdm-settings/package.nix

diff --git a/pkgs/by-name/gd/gdm-settings/package.nix b/pkgs/by-name/gd/gdm-settings/package.nix
new file mode 100644
index 000000000000..ab34a2eefb13
--- /dev/null
+++ b/pkgs/by-name/gd/gdm-settings/package.nix
@@ -0,0 +1,68 @@
+{
+  lib,
+  fetchFromGitHub,
+  python3Packages,
+  appstream,
+  blueprint-compiler,
+  desktop-file-utils,
+  glib,
+  gnome,
+  libadwaita,
+  meson,
+  ninja,
+  pkg-config,
+  wrapGAppsHook4,
+  # gdm-settings needs to know where to look for themes
+  # This should work for most systems, but can be overridden if not
+  dataDirs ? lib.concatStringsSep ":" [
+    "/run/current-system/sw/share"
+    "/usr/local/share"
+    "/usr/share"
+  ],
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "gdm-settings";
+  version = "4.4";
+  pyproject = false;
+
+  src = fetchFromGitHub {
+    owner = "gdm-settings";
+    repo = "gdm-settings";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-3Te8bhv2TkpJFz4llm1itRhzg9v64M7Drtrm4s9EyiQ=";
+  };
+
+  nativeBuildInputs = [
+    appstream # for appstream file validation
+    blueprint-compiler
+    desktop-file-utils # for desktop file validation
+    glib # for `glib-compile-schemas`
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook4
+  ];
+
+  buildInputs = [ libadwaita ];
+
+  dependencies = [ python3Packages.pygobject3 ];
+
+  dontWrapGApps = true;
+  makeWrapperArgs = [
+    "\${gappsWrapperArgs[@]}"
+    "--set-default HOST_DATA_DIRS ${dataDirs}"
+  ];
+
+  pythonImportsCheck = [ "gdms" ];
+
+  meta = {
+    description = "Settings app for GNOME's Login Manager";
+    homepage = "https://gdm-settings.github.io/";
+    changelog = "https://github.com/gdm-settings/gdm-settings/releases/tag/v${version}";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ getchoo ];
+    mainProgram = "gdm-settings";
+    inherit (gnome.gdm.meta) platforms;
+  };
+}

From 9fc1265538d97ca50e545fe9833fe2bf275925f1 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Fri, 16 Aug 2024 23:39:14 +0200
Subject: [PATCH 26/44] netatalk: 3.1.18 -> 3.1.19

Fixes CVE-2024-38439, CVE-2024-38440 and CVE-2024-38441.

https://github.com/Netatalk/netatalk/releases/tag/netatalk-3-1-19
---
 pkgs/tools/filesystems/netatalk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix
index 950d10640bf0..6262de5f94e8 100644
--- a/pkgs/tools/filesystems/netatalk/default.nix
+++ b/pkgs/tools/filesystems/netatalk/default.nix
@@ -17,11 +17,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "netatalk";
-  version = "3.1.18";
+  version = "3.1.19";
 
   src = fetchurl {
     url = "mirror://sourceforge/netatalk/netatalk/netatalk-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-htIJ3Hd2pLoXhFFk0uN2pGnO43aiexiuMYmOP0ukFlU=";
+    hash = "sha256-p0pzHwnjNNWPsWRBflgaZB+ijMP5bF99TEdLs4mVKsI=";
   };
 
   patches = [

From 01064da11ba3a6629322cc8c99cfaa436e80910c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 16 Aug 2024 22:04:33 +0000
Subject: [PATCH 27/44] emacsPackages.lsp-bridge: 0-unstable-2024-08-06 ->
 0-unstable-2024-08-12

---
 .../elisp-packages/manual-packages/lsp-bridge/default.nix   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix
index a44a9d79529e..86687a34b9fb 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/lsp-bridge/default.nix
@@ -29,13 +29,13 @@ let
 in
 melpaBuild {
   pname = "lsp-bridge";
-  version = "0-unstable-2024-08-06";
+  version = "0-unstable-2024-08-12";
 
   src = fetchFromGitHub {
     owner = "manateelazycat";
     repo = "lsp-bridge";
-    rev = "49b5497243873b1bddea09a4a988e3573ed7cc3e";
-    hash = "sha256-bGO5DjsetInDyGDHog5QJtAgz499kJEj52iWYIzdp5Y=";
+    rev = "658f08ee51c193f52a0e9723b190e5f6eef77ab7";
+    hash = "sha256-ksKvekDKYdlJULRmALudfduYe1TkW3aG2uBeKdHOokQ=";
   };
 
   patches = [

From 6bb94ba0c0e6b47b13304097d08b367f8f28b8f8 Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 14 Aug 2024 04:46:24 +0200
Subject: [PATCH 28/44] python312Packages.gradio-client: 1.2.0 -> 1.3.0

---
 pkgs/development/python-modules/gradio/client.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/gradio/client.nix b/pkgs/development/python-modules/gradio/client.nix
index ed2d52c30c39..327a242a6a21 100644
--- a/pkgs/development/python-modules/gradio/client.nix
+++ b/pkgs/development/python-modules/gradio/client.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
   nix-update-script,
@@ -27,7 +28,7 @@
 
 buildPythonPackage rec {
   pname = "gradio-client";
-  version = "1.2.0";
+  version = "1.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -39,7 +40,7 @@ buildPythonPackage rec {
     # not to be confused with @gradio/client@${version}
     rev = "refs/tags/gradio_client@${version}";
     sparseCheckout = [ "client/python" ];
-    hash = "sha256-l5WHNerSYNXrFGOpAqxxh0JLiFpatxq6a62q83tEavo=";
+    hash = "sha256-UZQWguUN3l0cj2wb2f7A61RTLy9nPYcIEwHIo+F1kR0=";
   };
   prePatch = ''
     cd client/python
@@ -91,6 +92,14 @@ buildPythonPackage rec {
     #"-x" "-W" "ignore" # uncomment for debugging help
   ];
 
+  disabledTests = lib.optionals stdenv.isDarwin [
+    # flaky: OSError: Cannot find empty port in range: 7860-7959
+    "test_layout_components_in_output"
+    "test_layout_and_state_components_in_output"
+    "test_upstream_exceptions"
+    "test_httpx_kwargs"
+  ];
+
   pythonImportsCheck = [ "gradio_client" ];
 
   __darwinAllowLocalNetworking = true;

From cf53a50fea9bc7e960698ec444cb1161a2afdfab Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Wed, 14 Aug 2024 04:46:06 +0200
Subject: [PATCH 29/44] python312Packages.gradio-pdf: 0.0.11 -> 0.0.13

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

diff --git a/pkgs/development/python-modules/gradio-pdf/default.nix b/pkgs/development/python-modules/gradio-pdf/default.nix
index fc32e80a8c1b..47c175697586 100644
--- a/pkgs/development/python-modules/gradio-pdf/default.nix
+++ b/pkgs/development/python-modules/gradio-pdf/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "gradio-pdf";
-  version = "0.0.11";
+  version = "0.0.13";
   format = "pyproject";
 
   src = fetchPypi {
     pname = "gradio_pdf";
     inherit version;
-    hash = "sha256-HCfjJdd9DIRqm/dS00xlU9AYGM7U/b3zNo2IgZHtasc=";
+    hash = "sha256-lxfbQSJavJQSYMGqxG7zmg/XT8V8TU2I3zGiq+B/dnw=";
   };
 
   nativeBuildInputs = [

From 989ea6abf316d4e24f8c32fc98a46029c196975f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 17 Aug 2024 04:54:21 +0000
Subject: [PATCH 30/44] sqlitecpp: 3.3.1 -> 3.3.2

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

diff --git a/pkgs/development/libraries/sqlitecpp/default.nix b/pkgs/development/libraries/sqlitecpp/default.nix
index e2c0b4ec35b9..a48e9a4ac87a 100644
--- a/pkgs/development/libraries/sqlitecpp/default.nix
+++ b/pkgs/development/libraries/sqlitecpp/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sqlitecpp";
-  version = "3.3.1";
+  version = "3.3.2";
 
   src = fetchFromGitHub {
     owner = "SRombauts";
     repo = "sqlitecpp";
     rev = finalAttrs.version;
-    sha256 = "sha256-8l1JRaE7w9vJ4bCSLGAk9zwYHDFeKkBi9pE5fUJfLRc=";
+    sha256 = "sha256-rsVFk4FsonrwpBd3TonkxilwWeOBocH8AyeB+71OBdI=";
   };
 
   nativeBuildInputs = [

From 4ffca9622ec634f7ca7861fa8d3e764d011760a7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 17 Aug 2024 07:40:29 +0000
Subject: [PATCH 31/44] nuclei-templates: 9.9.2 -> 9.9.3

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

diff --git a/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix
index 6e895ee70b47..a1d1ffbb412b 100644
--- a/pkgs/by-name/nu/nuclei-templates/package.nix
+++ b/pkgs/by-name/nu/nuclei-templates/package.nix
@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "nuclei-templates";
-  version = "9.9.2";
+  version = "9.9.3";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "nuclei-templates";
     rev = "refs/tags/v${version}";
-    hash = "sha256-PObtdRhj4KaQRHpSSGCZzhFXRYRAJ4mejkYi7SgOqyE=";
+    hash = "sha256-Iw2TbDQWRy3W7eaybtGG3C+RaciKfjWpYblrCPa8SCE=";
   };
 
   installPhase = ''

From 08b5d739cd935da4907433588afe07c2f50743fd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 17 Aug 2024 12:26:44 +0200
Subject: [PATCH 32/44] das: relax defusedxml

- fix build (https://hydra.nixos.org/build/269342119)
---
 pkgs/by-name/da/das/package.nix | 28 +++++++++++++---------------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/da/das/package.nix b/pkgs/by-name/da/das/package.nix
index 3ed340e72edb..8806e9181407 100644
--- a/pkgs/by-name/da/das/package.nix
+++ b/pkgs/by-name/da/das/package.nix
@@ -1,6 +1,7 @@
-{ lib
-, python3
-, fetchFromGitHub
+{
+  lib,
+  python3,
+  fetchFromGitHub,
 }:
 
 python3.pkgs.buildPythonApplication rec {
@@ -15,17 +16,15 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-WZmWpcBqxsNH96nVWwoepFhsvdxZpYKmAjNd7ghIJMA=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace 'networkx = "^2.8.4"' 'networkx = "*"' \
-      --replace 'netaddr = "^0.8.0"' 'netaddr = "*"'
-  '';
-
-  nativeBuildInputs = [
-    python3.pkgs.poetry-core
+  pythonRelaxDeps = [
+    "defusedxml"
+    "netaddr"
+    "networkx"
   ];
 
-  propagatedBuildInputs = with python3.pkgs; [
+  build-system = with python3.pkgs; [ poetry-core ];
+
+  dependencies = with python3.pkgs; [
     dash
     defusedxml
     dnspython
@@ -38,13 +37,12 @@ python3.pkgs.buildPythonApplication rec {
     tinydb
   ];
 
-  pythonImportsCheck = [
-    "das"
-  ];
+  pythonImportsCheck = [ "das" ];
 
   meta = with lib; {
     description = "Divide full port scan results and use it for targeted Nmap runs";
     homepage = "https://github.com/snovvcrash/DivideAndScan";
+    changelog = "https://github.com/snovvcrash/DivideAndScan/releases/tag/v${version}";
     license = licenses.bsd2;
     maintainers = with maintainers; [ fab ];
     mainProgram = "das";

From d1bd49189b75c24cc6afd3bff4bd89853e12b550 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 17 Aug 2024 11:45:13 +0200
Subject: [PATCH 33/44] python312Packages.pytrydan: 0.7.0 -> 0.8.1

Diff: https://github.com/dgomes/pytrydan/compare/refs/tags/v0.7.0...v0.8.1

Changelog: https://github.com/dgomes/pytrydan/blob/0.8.1/CHANGELOG.md
---
 pkgs/development/python-modules/pytrydan/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/pytrydan/default.nix b/pkgs/development/python-modules/pytrydan/default.nix
index 87cac954c486..90de83155562 100644
--- a/pkgs/development/python-modules/pytrydan/default.nix
+++ b/pkgs/development/python-modules/pytrydan/default.nix
@@ -6,6 +6,7 @@
   orjson,
   poetry-core,
   pytest-asyncio,
+  pytest-cov-stub,
   pytestCheckHook,
   pythonOlder,
   respx,
@@ -17,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "pytrydan";
-  version = "0.7.0";
+  version = "0.8.1";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -26,13 +27,10 @@ buildPythonPackage rec {
     owner = "dgomes";
     repo = "pytrydan";
     rev = "refs/tags/v${version}";
-    hash = "sha256-9TZZ4J3fIUGaeWYd5kP9eFABvL/95muD7sDevUaGprQ=";
+    hash = "sha256-OHC+Ul64BYCsgoFDxI1hPjBGkd/pQ0j0c9Pt5lWg1E0=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail " --cov=pytrydan --cov-report=term-missing:skip-covered" ""
-  '';
+  pythonRelaxDeps = [ "tenacity" ];
 
   build-system = [ poetry-core ];
 
@@ -46,6 +44,7 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytest-asyncio
+    pytest-cov-stub
     pytestCheckHook
     respx
     syrupy

From 0d0b7cb08774407d6cc2d918b3e178b2cf7e1527 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 17 Aug 2024 11:55:22 +0200
Subject: [PATCH 34/44] python312Packages.dvc-task: disable tests with require
 Docker setup

---
 pkgs/development/python-modules/dvc-task/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/dvc-task/default.nix b/pkgs/development/python-modules/dvc-task/default.nix
index ea93ceeffda0..63b2ed18e41c 100644
--- a/pkgs/development/python-modules/dvc-task/default.nix
+++ b/pkgs/development/python-modules/dvc-task/default.nix
@@ -49,6 +49,8 @@ buildPythonPackage rec {
   disabledTests = [
     # Test is flaky
     "test_start_already_exists"
+    # Tests require a Docker setup
+    "celery_setup_worker"
   ];
 
   meta = with lib; {

From 6e3b1fe20a905895c209181f814f7957f4ef11b5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 17 Aug 2024 11:52:36 +0200
Subject: [PATCH 35/44] python312Packages.pyenphase: refactor

---
 .../python-modules/pyenphase/default.nix            | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/pyenphase/default.nix b/pkgs/development/python-modules/pyenphase/default.nix
index 613fb911c85e..a96386890be1 100644
--- a/pkgs/development/python-modules/pyenphase/default.nix
+++ b/pkgs/development/python-modules/pyenphase/default.nix
@@ -10,6 +10,7 @@
   poetry-core,
   pyjwt,
   pytest-asyncio,
+  pytest-cov-stub,
   pytestCheckHook,
   pythonOlder,
   respx,
@@ -31,10 +32,7 @@ buildPythonPackage rec {
     hash = "sha256-letF0s/zJKdMT2nGnZpMFufja0bsL0zlwG+dCSK5BA4=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail " --cov=pyenphase --cov-report=term-missing:skip-covered" ""
-  '';
+  pythonRelaxDeps = [ "tenacity" ];
 
   build-system = [ poetry-core ];
 
@@ -50,14 +48,15 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytest-asyncio
+    pytest-cov-stub
     pytestCheckHook
     respx
     syrupy
   ];
 
-  disabledTests = [
-    # https://github.com/pyenphase/pyenphase/issues/97
-    "test_with_7_x_firmware"
+  disabledTestPaths = [
+    # Tests need network access
+    "tests/test_retries.py"
   ];
 
   pythonImportsCheck = [ "pyenphase" ];

From d016d37f4d87a869d4e6027324fff8cd704c3623 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 17 Aug 2024 11:08:49 +0000
Subject: [PATCH 36/44] gowall: 0.1.6 -> 0.1.7

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

diff --git a/pkgs/by-name/go/gowall/package.nix b/pkgs/by-name/go/gowall/package.nix
index b32a41769c71..7ec23d59c96b 100644
--- a/pkgs/by-name/go/gowall/package.nix
+++ b/pkgs/by-name/go/gowall/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "gowall";
-  version = "0.1.6";
+  version = "0.1.7";
 
   src = fetchFromGitHub {
     owner = "Achno";
     repo = "gowall";
     rev = "v${version}";
-    hash = "sha256-BNksshg1yK3mQuBaC4S3HzwfJ8vW0XxfDkG7YJAF00E=";
+    hash = "sha256-R7dOONfyzj6V3101Rp/WhUcFpqrSKWEkVm4a2riXZAI=";
   };
 
-  vendorHash = "sha256-jNx4ehew+IBx7M6ey/rT0vb53+9OBVYSEDJv8JWfZIw=";
+  vendorHash = "sha256-H2Io1K2LEFmEPJYVcEaVAK2ieBrkV6u+uX82XOvNXj4=";
 
   nativeBuildInputs = [ installShellFiles ];
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''

From 94a80ae771a5d35fb58f667ca4b60887136c2ebc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 17 Aug 2024 11:23:48 +0200
Subject: [PATCH 37/44] python312Packages.pytest-docker-tools: init at 3.1.3

Opionated helpers for creating py.test fixtures for Docker integration
and smoke testing environments

https://github.com/Jc2k/pytest-docker-tools
---
 .../pytest-docker-tools/default.nix           | 54 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 56 insertions(+)
 create mode 100644 pkgs/development/python-modules/pytest-docker-tools/default.nix

diff --git a/pkgs/development/python-modules/pytest-docker-tools/default.nix b/pkgs/development/python-modules/pytest-docker-tools/default.nix
new file mode 100644
index 000000000000..59a98ad27152
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-docker-tools/default.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  buildPythonPackage,
+  docker,
+  fetchFromGitHub,
+  fetchpatch,
+  poetry-core,
+  pytest,
+  pytestCheckHook,
+  pythonOlder,
+}:
+
+buildPythonPackage rec {
+  pname = "pytest-docker-tools";
+  version = "3.1.3";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "Jc2k";
+    repo = "pytest-docker-tools";
+    rev = "refs/tags/${version}";
+    hash = "sha256-6F3aSUyDlBBYG1kwOQvey7rujDdK83uJ3Q1dr8Uo1pw=";
+  };
+
+  patches = [
+    # Switch to poetry-core, https://github.com/Jc2k/pytest-docker-tools/pull/48
+    (fetchpatch {
+      name = "switch-poetry-core.patch";
+      url = "https://github.com/Jc2k/pytest-docker-tools/pull/48/commits/a655e4a32b075e06e89dd907b06bc4ad90703988.patch";
+      hash = "sha256-CwCBld7p+bqBfxV9IyxcCvfxXfnUSzCLF2m0ZduIqkU=";
+    })
+  ];
+
+  build-system = [ poetry-core ];
+
+  buildInputs = [ pytest ];
+
+  dependencies = [ docker ];
+
+  # Tests require a Docker setup
+  doCheck = false;
+
+  pythonImportsCheck = [ "pytest_docker_tools" ];
+
+  meta = with lib; {
+    description = "Opionated helpers for creating py.test fixtures for Docker integration and smoke testing environments";
+    homepage = "https://github.com/Jc2k/pytest-docker-tools";
+    changelog = "https://github.com/Jc2k/pytest-docker-tools/releases/tag/${version}";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4b610e7c7013..0c823a0bd143 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12503,6 +12503,8 @@ self: super: with self; {
 
   pytest-django = callPackage ../development/python-modules/pytest-django { };
 
+  pytest-docker-tools = callPackage ../development/python-modules/pytest-docker-tools { };
+
   pytest-doctestplus = callPackage ../development/python-modules/pytest-doctestplus { };
 
   pytest-dotenv = callPackage ../development/python-modules/pytest-dotenv { };

From 99e8be853f0661049b159cfca9105f6a008cfc52 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 17 Aug 2024 12:32:31 +0000
Subject: [PATCH 38/44] cloudlist: 1.0.8 -> 1.0.9

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

diff --git a/pkgs/tools/security/cloudlist/default.nix b/pkgs/tools/security/cloudlist/default.nix
index 70e09efd747d..c2a998d9814f 100644
--- a/pkgs/tools/security/cloudlist/default.nix
+++ b/pkgs/tools/security/cloudlist/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "cloudlist";
-  version = "1.0.8";
+  version = "1.0.9";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "cloudlist";
     rev = "refs/tags/v${version}";
-    hash = "sha256-UyZ9KSjFu/NKiz4AZoKwHiWzh+KOARDmveCWcFbOS7A=";
+    hash = "sha256-aXKDSV/+okwO4UbljQr2fS/UcJkb5gC1nPZgpN7GuLY=";
   };
 
-  vendorHash = "sha256-tMrTAbfD+ip/UxrGTaMswgqo94rJZ0lqqxPgYFhZoTY=";
+  vendorHash = "sha256-xRxbLI+CEgMYh3nThUCqcKQR6AQV/J6E98xVTfcD2h4=";
 
   ldflags = [
     "-w"

From 8e7e1b41ad6c782778a028f9bb1dbd6128a0b419 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 17 Aug 2024 13:27:00 +0000
Subject: [PATCH 39/44] api-linter: 1.67.1 -> 1.67.2

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

diff --git a/pkgs/by-name/ap/api-linter/package.nix b/pkgs/by-name/ap/api-linter/package.nix
index 94214ae85545..9a01c0548e60 100644
--- a/pkgs/by-name/ap/api-linter/package.nix
+++ b/pkgs/by-name/ap/api-linter/package.nix
@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "api-linter";
-  version = "1.67.1";
+  version = "1.67.2";
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "api-linter";
     rev = "v${version}";
-    hash = "sha256-nbLaLi3Uh/zU+SPHA2x8cMic/bOKBo9wybK3b1LHNpY=";
+    hash = "sha256-xwRpJKAkZFSpmAQti2EswM6RXlJVwD+nNY9t5oRzU1s=";
   };
 
   vendorHash = "sha256-+dyoWK5iXH480c+akg26BCF/J8lKQoATVqZUfqMa080=";

From 577eaa9d500ef5af4e037f0dec52d0a138bdc028 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 17 Aug 2024 04:55:10 +0000
Subject: [PATCH 40/44] tclcurl: 7.22.0 -> 7.22.1

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

diff --git a/pkgs/by-name/tc/tclcurl/package.nix b/pkgs/by-name/tc/tclcurl/package.nix
index 48cd26a7d717..2bcfef25a3bd 100644
--- a/pkgs/by-name/tc/tclcurl/package.nix
+++ b/pkgs/by-name/tc/tclcurl/package.nix
@@ -7,13 +7,13 @@
 
 tcl.mkTclDerivation rec {
   pname = "tclcurl";
-  version = "7.22.0";
+  version = "7.22.1";
 
   src = fetchFromGitHub {
     owner = "flightaware";
     repo = "tclcurl-fa";
     rev = "refs/tags/v${version}";
-    hash = "sha256-FQSzujHuP7vGJ51sdXh+31gRKqn98dV1kIqMKSoVB0M=";
+    hash = "sha256-XQuP+SiqvGX3ckBShUxsGBADjV3QdvYpU4hW6LMbMMQ=";
   };
 
   buildInputs = [ curl ];

From 7c11ef08892200d04de48e108777fc999f300645 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Thu, 15 Aug 2024 18:19:46 +0200
Subject: [PATCH 41/44] busybox: apply patches for CVE-2022-48174,
 CVE-2023-42366, CVE-2023-42363, CVE-2023-42364 and CVE-2023-42365

I used some patches from Ubuntu and Alpine instead of upstream directly to avoid some conflicts.
---
 pkgs/os-specific/linux/busybox/default.nix | 23 +++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix
index 4a291cc03b8f..4ce47eedba2a 100644
--- a/pkgs/os-specific/linux/busybox/default.nix
+++ b/pkgs/os-specific/linux/busybox/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, buildPackages, fetchurl, fetchFromGitLab
+{ stdenv, lib, buildPackages, fetchurl, fetchpatch, fetchFromGitLab
 , enableStatic ? stdenv.hostPlatform.isStatic
 , enableMinimal ? false
 , enableAppletSymlinks ? true
@@ -75,6 +75,27 @@ stdenv.mkDerivation rec {
       url = "https://git.alpinelinux.org/aports/plain/main/busybox/0002-nslookup-sanitize-all-printed-strings-with-printable.patch?id=ed92963eb55bbc8d938097b9ccb3e221a94653f4";
       sha256 = "sha256-vl1wPbsHtXY9naajjnTicQ7Uj3N+EQ8pRNnrdsiow+w=";
     })
+    (fetchpatch {
+      name = "CVE-2022-48174.patch"; # https://bugs.busybox.net/show_bug.cgi?id=15216
+      url = "https://git.busybox.net/busybox/patch/?id=d417193cf37ca1005830d7e16f5fa7e1d8a44209";
+      hash = "sha256-mpDEwYncpU6X6tmtj9xM2KCrB/v2ys5bYxmPPrhm6es=";
+    })
+    (fetchpatch {
+      name = "CVE-2023-42366.patch"; # https://bugs.busybox.net/show_bug.cgi?id=15874
+      # This patch is also used by Alpine, see https://git.alpinelinux.org/aports/tree/main/busybox/0037-awk.c-fix-CVE-2023-42366-bug-15874.patch
+      url = "https://bugs.busybox.net/attachment.cgi?id=9697";
+      hash = "sha256-2eYfLZLjStea9apKXogff6sCAdG9yHx0ZsgUBaGfQIA=";
+    })
+    (fetchpatch {
+      name = "CVE-2023-42363.patch"; # https://bugs.busybox.net/show_bug.cgi?id=15865
+      url = "https://git.launchpad.net/ubuntu/+source/busybox/plain/debian/patches/CVE-2023-42363.patch?id=c9d8a323b337d58e302717d41796aa0242963d5a";
+      hash = "sha256-1W9Q8+yFkYQKzNTrvndie8QuaEbyAFL1ZASG2fPF+Z4=";
+    })
+    (fetchpatch {
+      name = "CVE-2023-42364_CVE-2023-42365.patch"; # https://bugs.busybox.net/show_bug.cgi?id=15871 https://bugs.busybox.net/show_bug.cgi?id=15868
+      url = "https://git.alpinelinux.org/aports/plain/main/busybox/CVE-2023-42364-CVE-2023-42365.patch?id=8a4bf5971168bf48201c05afda7bee0fbb188e13";
+      hash = "sha256-nQPgT9eA1asCo38Z9X7LR9My0+Vz5YBPba3ARV3fWcc=";
+    })
   ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ./clang-cross.patch;
 
   separateDebugInfo = true;

From 6a582916c3438f8ff5919306087ce68d2b73ec41 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 17 Aug 2024 15:41:52 +0200
Subject: [PATCH 42/44] home-assistant-custom-components.dwd: init at 2024.4.0

---
 .../custom-components/default.nix             |  2 ++
 .../custom-components/dwd/default.nix         | 31 +++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/servers/home-assistant/custom-components/dwd/default.nix

diff --git a/pkgs/servers/home-assistant/custom-components/default.nix b/pkgs/servers/home-assistant/custom-components/default.nix
index 74393821e347..5941137e2a45 100644
--- a/pkgs/servers/home-assistant/custom-components/default.nix
+++ b/pkgs/servers/home-assistant/custom-components/default.nix
@@ -12,6 +12,8 @@
 
   better_thermostat = callPackage ./better_thermostat {};
 
+  dwd = callPackage ./dwd { };
+
   elevenlabs_tts = callPackage ./elevenlabs_tts {};
 
   emporia_vue = callPackage ./emporia_vue {};
diff --git a/pkgs/servers/home-assistant/custom-components/dwd/default.nix b/pkgs/servers/home-assistant/custom-components/dwd/default.nix
new file mode 100644
index 000000000000..a7b1da7bddea
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-components/dwd/default.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildHomeAssistantComponent,
+  defusedxml,
+}:
+
+buildHomeAssistantComponent rec {
+  owner = "hg1337";
+  domain = "dwd";
+  version = "2024.4.0";
+
+  src = fetchFromGitHub {
+    owner = "hg1337";
+    repo = "homeassistant-dwd";
+    rev = version;
+    hash = "sha256-2bmLEBt6031p9SN855uunq7HrRJ9AFokw8t4CSBidTM=";
+  };
+
+  dependencies = [ defusedxml ];
+
+  # defusedxml version mismatch
+  dontCheckManifest = true;
+
+  meta = with lib; {
+    description = "Custom component for Home Assistant that integrates weather data (measurements and forecasts) of Deutscher Wetterdienst";
+    homepage = "https://github.com/hg1337/homeassistant-dwd";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ hexa ];
+  };
+}

From 077938f18bb6cc8f806653197e8a9d5f1e74561e Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Sat, 17 Aug 2024 20:49:43 +0530
Subject: [PATCH 43/44] nixos/hypridle: switch to package provided user service
 file

format with nixfmt-rfc-style
---
 nixos/modules/services/wayland/hypridle.nix | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/wayland/hypridle.nix b/nixos/modules/services/wayland/hypridle.nix
index 5442802df987..ee35812fd440 100644
--- a/nixos/modules/services/wayland/hypridle.nix
+++ b/nixos/modules/services/wayland/hypridle.nix
@@ -1,4 +1,9 @@
-{ lib, pkgs, config, ... }:
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
 
 let
   cfg = config.services.hypridle;
@@ -10,16 +15,9 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    environment.systemPackages = [
-      cfg.package
-    ];
+    environment.systemPackages = [ cfg.package ];
 
-    systemd.user.services.hypridle = {
-      description = "Hypridle idle daemon";
-      wantedBy = [ "graphical-session.target" ];
-      partOf = [ "graphical-session.target" ];
-      script = lib.getExe cfg.package;
-    };
+    systemd.packages = [ cfg.package ];
   };
 
   meta.maintainers = with lib.maintainers; [ johnrtitor ];

From 83ffe6d52aba23c84e556c08545028d04f63ac84 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 17 Aug 2024 13:26:06 +0000
Subject: [PATCH 44/44] minio: 2024-08-03T04-33-23Z -> 2024-08-17T01-24-54Z

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

diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix
index ab0b5225ded6..3d0879cecba9 100644
--- a/pkgs/servers/minio/default.nix
+++ b/pkgs/servers/minio/default.nix
@@ -21,16 +21,16 @@ let
 in
 buildGoModule rec {
   pname = "minio";
-  version = "2024-08-03T04-33-23Z";
+  version = "2024-08-17T01-24-54Z";
 
   src = fetchFromGitHub {
     owner = "minio";
     repo = "minio";
     rev = "RELEASE.${version}";
-    hash = "sha256-bzEGckelhq5jJGm6dbdPsIBqksv/jY6hQUf/STQUsoE=";
+    hash = "sha256-e3Zti0v+2jfRkVoXOfqW5uw9zvIfoAKhkolfNtyBNaE=";
   };
 
-  vendorHash = "sha256-ytkiQ/g0BwHyr6LY4SGBBmfRRCFTsBtDHClyRBboGCk=";
+  vendorHash = "sha256-diRNxBmWB/aJjS8+/+7Dc/2RmI93SZpmfsqP+2i9X1Q=";
 
   doCheck = false;