From e542b7432fe08339c94c91fb2a5033765cf558f3 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Tue, 25 Jun 2024 07:50:03 +0200
Subject: [PATCH 01/60] pebble: fix version info

---
 pkgs/tools/admin/pebble/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/admin/pebble/default.nix b/pkgs/tools/admin/pebble/default.nix
index 384cc0f3d928..35f064f78aae 100644
--- a/pkgs/tools/admin/pebble/default.nix
+++ b/pkgs/tools/admin/pebble/default.nix
@@ -18,6 +18,11 @@ buildGoModule rec {
 
   vendorHash = null;
 
+  ldflags = [
+    "-s" "-w"
+    "-X main.version=${version}"
+  ];
+
   passthru.tests = {
     smoke-test = nixosTests.acme;
   };
@@ -26,8 +31,10 @@ buildGoModule rec {
     # ca/ca.go:374:67: 9223372038 (untyped int constant) overflows uint
     broken = stdenv.hostPlatform.is32bit;
     homepage = "https://github.com/letsencrypt/pebble";
-    description = "Miniature version of Boulder, Pebble is a small RFC 8555 ACME test server not suited for a production CA";
+    description = "Small RFC 8555 ACME test server";
+    longDescription = "Miniature version of Boulder, Pebble is a small RFC 8555 ACME test server not suited for a production CA";
     license = [ lib.licenses.mpl20 ];
+    mainProgram = "pebble";
     maintainers = lib.teams.acme.members;
   };
 }

From 38572248116762d34783858425d0947153753651 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Tue, 25 Jun 2024 07:50:17 +0200
Subject: [PATCH 02/60] pebble: 2.4.0 -> 2.6.0

---
 pkgs/tools/admin/pebble/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/admin/pebble/default.nix b/pkgs/tools/admin/pebble/default.nix
index 35f064f78aae..703ca1ff6c86 100644
--- a/pkgs/tools/admin/pebble/default.nix
+++ b/pkgs/tools/admin/pebble/default.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "pebble";
-  version = "2.4.0";
+  version = "2.6.0";
 
   src = fetchFromGitHub {
     owner = "letsencrypt";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0sh67bzq3hlagk73w2kp45viq15g2rcxm760jk9fqshamq784m6m";
+    hash = "sha256-YPU/bl7h6rOWg+5ut0Thn2UupeKpJ7u4KXc2svIeZEM=";
   };
 
   vendorHash = null;
@@ -28,8 +28,6 @@ buildGoModule rec {
   };
 
   meta = {
-    # ca/ca.go:374:67: 9223372038 (untyped int constant) overflows uint
-    broken = stdenv.hostPlatform.is32bit;
     homepage = "https://github.com/letsencrypt/pebble";
     description = "Small RFC 8555 ACME test server";
     longDescription = "Miniature version of Boulder, Pebble is a small RFC 8555 ACME test server not suited for a production CA";

From 482e7aeeb52c381cd206e9c9e8e3f1742a49b429 Mon Sep 17 00:00:00 2001
From: laniusv0 <s57vlani@uni-bonn.de>
Date: Wed, 3 Jul 2024 18:05:07 +0200
Subject: [PATCH 03/60] maintainers: add vcele

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 53a84402ce22..b921fb0b280d 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -20963,6 +20963,12 @@
     githubId = 8889722;
     name = "Vitomir Čanadi";
   };
+  vcele = {
+    email = "ejycebfx@duck.com";
+    github = "Vcele";
+    githubId = 101071881;
+    name = "Victor";
+  };
   vcunat = {
     name = "Vladimír Čunát";
     # vcunat@gmail.com predominated in commits before 2019/03

From 11b3d86444abd59a9066ce02f596751be48090cd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 12 Jul 2024 09:16:40 +0000
Subject: [PATCH 04/60] wootility: 4.6.20 -> 4.6.21

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

diff --git a/pkgs/tools/misc/wootility/default.nix b/pkgs/tools/misc/wootility/default.nix
index 7a6343470f4a..e23f161f9024 100644
--- a/pkgs/tools/misc/wootility/default.nix
+++ b/pkgs/tools/misc/wootility/default.nix
@@ -6,10 +6,10 @@
 
 let
   pname = "wootility";
-  version = "4.6.20";
+  version = "4.6.21";
   src = fetchurl {
     url = "https://s3.eu-west-2.amazonaws.com/wooting-update/wootility-lekker-linux-latest/wootility-lekker-${version}.AppImage";
-    sha256 = "sha256-JodmF3TThPpXXx1eOnYmYAJ4x5Ylcf35bw3R++5/Buk=";
+    sha256 = "sha256-ockTQLZWbYvsLzv+D0exD5W/yMaIdse4/JQshbkVzAU=";
   };
 in
 

From 82816bac618021fcad28b954f21184de84bc9ea1 Mon Sep 17 00:00:00 2001
From: Gavin John <>
Date: Thu, 11 Jul 2024 16:59:00 -0400
Subject: [PATCH 05/60] immersed-vr: Add pandapip1 as maintainer

---
 pkgs/by-name/im/immersed-vr/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/im/immersed-vr/package.nix b/pkgs/by-name/im/immersed-vr/package.nix
index eb4b4ad08cff..f057d192ca97 100644
--- a/pkgs/by-name/im/immersed-vr/package.nix
+++ b/pkgs/by-name/im/immersed-vr/package.nix
@@ -26,7 +26,7 @@ let
     description = "VR coworking platform";
     homepage = "https://immersed.com";
     license = licenses.unfree;
-    maintainers = with maintainers; [ haruki7049 ];
+    maintainers = with maintainers; [ haruki7049 pandapip1 ];
     platforms = builtins.attrNames sources;
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
   };

From f73ef0768048adba78e38bd5d670d63f6e8503bb Mon Sep 17 00:00:00 2001
From: Gavin John <>
Date: Thu, 11 Jul 2024 16:59:15 -0400
Subject: [PATCH 06/60] nixos/immersed-vr: init module

---
 nixos/modules/module-list.nix          |  1 +
 nixos/modules/programs/immersed-vr.nix | 34 ++++++++++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 nixos/modules/programs/immersed-vr.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 30a11980b7b6..0df92c7193a8 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -213,6 +213,7 @@
   ./programs/iay.nix
   ./programs/iftop.nix
   ./programs/i3lock.nix
+  ./programs/immersed-vr.nix
   ./programs/iotop.nix
   ./programs/java.nix
   ./programs/joycond-cemuhook.nix
diff --git a/nixos/modules/programs/immersed-vr.nix b/nixos/modules/programs/immersed-vr.nix
new file mode 100644
index 000000000000..57edb3cbaea0
--- /dev/null
+++ b/nixos/modules/programs/immersed-vr.nix
@@ -0,0 +1,34 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.programs.immersed-vr;
+in
+{
+
+  options = {
+    programs.immersed-vr = {
+      enable = lib.mkEnableOption "immersed-vr";
+
+      package = lib.mkPackageOption pkgs "immersed-vr" {};
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    boot = {
+      kernelModules = [ "v4l2loopback" "snd-aloop" ];
+      extraModulePackages = [ config.boot.kernelPackages.v4l2loopback ];
+      extraModprobeConfig = ''
+        options v4l2loopback exclusive_caps=1 card_label="v4l2loopback Virtual Camera"
+      '';
+    };
+
+    environment.systemPackages = [ cfg.package ];
+  };
+
+  meta.maintainers = pkgs.immersed-vr.meta.maintainers;
+}

From 467f7b25f68e412ce9bae60352e079a3308e369e Mon Sep 17 00:00:00 2001
From: Gavin John <>
Date: Thu, 11 Jul 2024 17:01:05 -0400
Subject: [PATCH 07/60] nixos/doc/rl-2411: Document programs.immersed-vr

---
 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 1c3865b5f834..8661fb1438f2 100644
--- a/nixos/doc/manual/release-notes/rl-2411.section.md
+++ b/nixos/doc/manual/release-notes/rl-2411.section.md
@@ -36,6 +36,8 @@
 
 - [ddns-updater](https://github.com/qdm12/ddns-updater), a service to update DNS records periodically with WebUI for many DNS providers. Available as [services.ddns-updater](#opt-services.ddns-updater.enable).
 
+- [Immersed VR](https://immersed.com/), a closed-source coworking platform. Available as [programs.immersed-vr](#opt-programs.immersed-vr.enable).
+
 - [Renovate](https://github.com/renovatebot/renovate), a dependency updating tool for various git forges and language ecosystems. Available as [services.renovate](#opt-services.renovate.enable).
 
 - [Music Assistant](https://music-assistant.io/), a music library manager for your offline and online music sources which can easily stream your favourite music to a wide range of supported players. Available as [services.music-assistant](#opt-services.music-assistant.enable).

From 0e2263158bc09f92fd19e7eaa691fb837a2522d9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Jul 2024 17:19:46 +0000
Subject: [PATCH 08/60] microsoft-edge: 126.0.2592.102 -> 126.0.2592.113

---
 .../networking/browsers/microsoft-edge/default.nix   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/pkgs/applications/networking/browsers/microsoft-edge/default.nix
index 44e71b4c9e2a..9e36c187aa94 100644
--- a/pkgs/applications/networking/browsers/microsoft-edge/default.nix
+++ b/pkgs/applications/networking/browsers/microsoft-edge/default.nix
@@ -1,20 +1,20 @@
 {
   beta = import ./browser.nix {
     channel = "beta";
-    version = "127.0.2651.49";
+    version = "127.0.2651.61";
     revision = "1";
-    hash = "sha256-fMB7CuC5u8RNbbtFEZWFIIBwZTPkTP9LVs7DCXltGEA=";
+    hash = "sha256-M67QOKZF4+dGCdyKfe5EF5K4A6bip2/a4J1k7+v3QMQ=";
   };
   dev = import ./browser.nix {
     channel = "dev";
-    version = "128.0.2677.1";
+    version = "128.0.2708.0";
     revision = "1";
-    hash = "sha256-aKrNs44FZNhC/fGT1UvyE2Fx8Q53ahAu91Bu86E49o8=";
+    hash = "sha256-QFtVQTcbiF165/Xqmo8kAoo4kQegqqzMVcr8mQiraH8=";
   };
   stable = import ./browser.nix {
     channel = "stable";
-    version = "126.0.2592.102";
+    version = "126.0.2592.113";
     revision = "1";
-    hash = "sha256-xCjtsZoetxlOV77VSbt09cGbpfHUYhTA6WXuZAvD/a4=";
+    hash = "sha256-wSNXCUTG9eCnqe5Ir8pE8Z7zuY2KsDgTLKKTAQeXS2s=";
   };
 }

From f21d4e7004ae3a2eaa9f6cf3f768981ece245fed Mon Sep 17 00:00:00 2001
From: laniusv0 <s57vlani@uni-bonn.de>
Date: Wed, 3 Jul 2024 18:09:01 +0200
Subject: [PATCH 09/60] mongocxx: 3.8.1 -> 3.10.2

add stenv override in top-level
---
 .../libraries/mongocxx/default.nix            | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/mongocxx/default.nix b/pkgs/development/libraries/mongocxx/default.nix
index a17e7f8d037f..5659043e2f62 100644
--- a/pkgs/development/libraries/mongocxx/default.nix
+++ b/pkgs/development/libraries/mongocxx/default.nix
@@ -1,5 +1,5 @@
 { lib
-, stdenv
+, pkgs
 , fetchFromGitHub
 , mongoc
 , openssl
@@ -7,23 +7,26 @@
 , cmake
 , validatePkgConfig
 , testers
+, darwin
 }:
 
+let stdenv = if pkgs.stdenv.isDarwin then darwin.apple_sdk_11_0.stdenv else pkgs.stdenv; in
+
 stdenv.mkDerivation (finalAttrs: {
   pname = "mongocxx";
-  version = "3.8.1";
+  version = "3.10.2";
 
   src = fetchFromGitHub {
     owner = "mongodb";
     repo = "mongo-cxx-driver";
     rev = "refs/tags/r${finalAttrs.version}";
-    hash = "sha256-fBZg69jsvXzhllpcPBGXkjYyvUQImnGNkb2Ek5Oi0p4=";
+    hash = "sha256-nGLE0vyCe3PaNJf3duXdBfAhTdRvdeQ+OCwcaSDxi5Y=";
   };
 
   postPatch = ''
-    substituteInPlace src/bsoncxx/config/CMakeLists.txt \
-      src/mongocxx/config/CMakeLists.txt \
-      --replace "\\\''${prefix}/" ""
+    substituteInPlace src/bsoncxx/cmake/libbsoncxx.pc.in \
+      src/mongocxx/cmake/libmongocxx.pc.in \
+      --replace "\''${prefix}/" ""
   '';
 
   nativeBuildInputs = [
@@ -35,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
     mongoc
     openssl
     cyrus_sasl
-  ];
+  ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security;
 
   cmakeFlags = [
     "-DCMAKE_CXX_STANDARD=20"
@@ -49,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Official C++ client library for MongoDB";
     homepage = "http://mongocxx.org";
     license = licenses.asl20;
-    maintainers = with maintainers; [ adriandole ];
+    maintainers = with maintainers; [ adriandole vcele ];
     pkgConfigModules = [ "libmongocxx" "libbsoncxx" ];
     platforms = platforms.all;
     badPlatforms = [ "x86_64-darwin" ]; # needs sdk >= 10.14

From 4a79f0bce26d4f978ff45b1992aeff59aa37bd4a Mon Sep 17 00:00:00 2001
From: Ivan Trubach <mr.trubach@icloud.com>
Date: Thu, 25 Jul 2024 11:37:23 +0300
Subject: [PATCH 10/60] lutok: update meta.description

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

diff --git a/pkgs/by-name/lu/lutok/package.nix b/pkgs/by-name/lu/lutok/package.nix
index a09724b5348f..144854abb9e4 100644
--- a/pkgs/by-name/lu/lutok/package.nix
+++ b/pkgs/by-name/lu/lutok/package.nix
@@ -77,7 +77,7 @@ lib.fix (
     __structuredAttrs = true;
 
     meta = {
-      description = "Libraries to write tests in C, C++, and shell";
+      description = "Lightweight C++ API for Lua";
       homepage = "https://github.com/freebsd/lutok/";
       license = lib.licenses.bsd3;
       maintainers = with lib.maintainers; [ reckenrode ];

From 4ea4381e8973c339a048a6aeb89c78b4f2c9c476 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 25 Jul 2024 11:53:56 +0000
Subject: [PATCH 11/60] infisical: 0.25.0 -> 0.26.1

---
 pkgs/development/tools/infisical/default.nix | 2 +-
 pkgs/development/tools/infisical/hashes.json | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/infisical/default.nix b/pkgs/development/tools/infisical/default.nix
index 0bfbb401b3cf..0c548eb22060 100644
--- a/pkgs/development/tools/infisical/default.nix
+++ b/pkgs/development/tools/infisical/default.nix
@@ -15,7 +15,7 @@ let
   buildHashes = builtins.fromJSON (builtins.readFile ./hashes.json);
 
   # the version of infisical
-  version = "0.25.0";
+  version = "0.26.1";
 
   # the platform-specific, statically linked binary
   src =
diff --git a/pkgs/development/tools/infisical/hashes.json b/pkgs/development/tools/infisical/hashes.json
index 5454f7a7a9d6..d167f6c7bfb0 100644
--- a/pkgs/development/tools/infisical/hashes.json
+++ b/pkgs/development/tools/infisical/hashes.json
@@ -1,6 +1,6 @@
 { "_comment": "@generated by pkgs/development/tools/infisical/update.sh"
-, "x86_64-linux": "sha256-BpOobdWp+pt9zb/OemrUGXv9TbGlzNWjQM3Oe+55W8Q="
-, "x86_64-darwin": "sha256-Lr8B6TI9kffQHLgYtoctcVFHdBPTU6DcMETqxaqVNqU="
-, "aarch64-linux": "sha256-Jq6NOhZR57Thbq2cnHjJXVU00zhZF8UCJTCEBo6DT64="
-, "aarch64-darwin": "sha256-6htS81iK3L90mWS/exTHg8C7agPx5XH+6VBj+AN4X0o="
+, "x86_64-linux": "sha256-53Nk24THJ16elOTuPkXohxvLeSn1cXyI8PIogpg7b2g="
+, "x86_64-darwin": "sha256-iO/WPfLSmYQJRuuPSfXbrb1p75czP4FQkc3ryQ/PWF4="
+, "aarch64-linux": "sha256-7FCxF6M9J6NYTeXw98uu3GjWsXsTZ+eQdKgbutGKDtI="
+, "aarch64-darwin": "sha256-lV2jye63ZWlMIa41+xbfe39kBHKwnXtNsBlM+WZvWhQ="
 }

From 9e0f47d6dc7b2cf5ed845f3df61ee8dd3c31074d Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 19 Jun 2024 10:07:52 -0300
Subject: [PATCH 12/60] qmplay2: prepare to by-name migration

- get rid of libsForQt5 indirection
- postFixup instead of postInstall
- meta.mainProgram
---
 pkgs/applications/video/qmplay2/default.nix | 65 +++++++++++----------
 pkgs/top-level/all-packages.nix             |  2 +-
 2 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/pkgs/applications/video/qmplay2/default.nix b/pkgs/applications/video/qmplay2/default.nix
index 167b5e8601e2..5832ac7bf92e 100644
--- a/pkgs/applications/video/qmplay2/default.nix
+++ b/pkgs/applications/video/qmplay2/default.nix
@@ -1,27 +1,26 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, alsa-lib
-, cmake
-, ffmpeg
-, fribidi
-, game-music-emu
-, libXdmcp
-, libXv
-, libass
-, libcddb
-, libcdio
-, libpulseaudio
-, libsidplayfp
-, libva
-, libxcb
-, pkg-config
-, qtbase
-, qttools
-, taglib
-, vulkan-headers
-, vulkan-tools
-, wrapQtAppsHook
+{
+  lib,
+  alsa-lib,
+  cmake,
+  fetchFromGitHub,
+  ffmpeg,
+  fribidi,
+  game-music-emu,
+  libXdmcp,
+  libXv,
+  libass,
+  libcddb,
+  libcdio,
+  libpulseaudio,
+  libsidplayfp,
+  libva,
+  libxcb,
+  pkg-config,
+  qt5,
+  stdenv,
+  taglib,
+  vulkan-headers,
+  vulkan-tools,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -39,7 +38,9 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+  ]
+  ++ [
+    qt5.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -56,16 +57,19 @@ stdenv.mkDerivation (finalAttrs: {
     libsidplayfp
     libva
     libxcb
-    qtbase
-    qttools
     taglib
     vulkan-headers
     vulkan-tools
+  ]
+  ++ [
+    qt5.qtbase
+    qt5.qttools
   ];
 
-  postInstall = ''
-    # Because we think it is better to use only lowercase letters!
-    ln -s $out/bin/QMPlay2 $out/bin/qmplay2
+  # Because we think it is better to use only lowercase letters!
+  # But sometimes we come across case-insensitive filesystems...
+  postFixup = ''
+    [ -e $out/bin/qmplay2 ] || ln -s $out/bin/QMPlay2 $out/bin/qmplay2
   '';
 
   meta = {
@@ -79,6 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     changelog = "https://github.com/zaps166/QMPlay2/releases/tag/${finalAttrs.version}";
     license = lib.licenses.lgpl3Plus;
+    mainProgram = "qmplay2";
     maintainers = with lib.maintainers; [ AndersonTorres kashw2 ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 84cae899cd6d..a3e2a3bc2536 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -33407,7 +33407,7 @@ with pkgs;
 
   qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { };
 
-  qmplay2 = libsForQt5.callPackage ../applications/video/qmplay2 { };
+  qmplay2 = callPackage ../applications/video/qmplay2 { };
 
   qmidiarp = callPackage ../applications/audio/qmidiarp { };
 

From 8d69d772441358c0dcab782f241996dd8849107f Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 19 Jun 2024 10:10:10 -0300
Subject: [PATCH 13/60] qmplay2: migrate to by-name

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

diff --git a/pkgs/applications/video/qmplay2/default.nix b/pkgs/by-name/qm/qmplay2/package.nix
similarity index 100%
rename from pkgs/applications/video/qmplay2/default.nix
rename to pkgs/by-name/qm/qmplay2/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a3e2a3bc2536..6f6a027b1077 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -33407,8 +33407,6 @@ with pkgs;
 
   qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { };
 
-  qmplay2 = callPackage ../applications/video/qmplay2 { };
-
   qmidiarp = callPackage ../applications/audio/qmidiarp { };
 
   qmidinet = libsForQt5.callPackage ../applications/audio/qmidinet { };

From 02dfdf731e801a6181ff4838d48c0da9ada02075 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 19 Jun 2024 12:50:40 -0300
Subject: [PATCH 14/60] qmplay2: detach sources acquisition to `sources.nix`

Because it uses fetchSubmodules, and maybe in the future it will
become discouraged.
---
 pkgs/by-name/qm/qmplay2/package.nix | 16 +++++-----------
 pkgs/by-name/qm/qmplay2/sources.nix | 21 +++++++++++++++++++++
 2 files changed, 26 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/by-name/qm/qmplay2/sources.nix

diff --git a/pkgs/by-name/qm/qmplay2/package.nix b/pkgs/by-name/qm/qmplay2/package.nix
index 5832ac7bf92e..9c2697827421 100644
--- a/pkgs/by-name/qm/qmplay2/package.nix
+++ b/pkgs/by-name/qm/qmplay2/package.nix
@@ -1,8 +1,8 @@
 {
   lib,
   alsa-lib,
+  callPackage,
   cmake,
-  fetchFromGitHub,
   ffmpeg,
   fribidi,
   game-music-emu,
@@ -23,17 +23,11 @@
   vulkan-tools,
 }:
 
+let
+  sources = callPackage ./sources.nix { };
+in
 stdenv.mkDerivation (finalAttrs: {
-  pname = "qmplay2";
-  version = "24.04.07";
-
-  src = fetchFromGitHub {
-    owner = "zaps166";
-    repo = "QMPlay2";
-    rev = finalAttrs.version;
-    fetchSubmodules = true;
-    hash = "sha256-WIDGApvl+aaB3Vdv0sHY+FHWqzreWWd3/xOLV11YfxM=";
-  };
+  inherit (sources.qmplay2) pname version src;
 
   nativeBuildInputs = [
     cmake
diff --git a/pkgs/by-name/qm/qmplay2/sources.nix b/pkgs/by-name/qm/qmplay2/sources.nix
new file mode 100644
index 000000000000..e32b640a6e47
--- /dev/null
+++ b/pkgs/by-name/qm/qmplay2/sources.nix
@@ -0,0 +1,21 @@
+{
+  fetchFromGitHub,
+}:
+
+{
+  qmplay2 = let
+    self = {
+      pname = "qmplay2";
+      version = "24.04.07";
+
+      src = fetchFromGitHub {
+        owner = "zaps166";
+        repo = "QMPlay2";
+        rev = self.version;
+        fetchSubmodules = true;
+        hash = "sha256-WIDGApvl+aaB3Vdv0sHY+FHWqzreWWd3/xOLV11YfxM=";
+      };
+    };
+  in
+    self;
+}

From 365e7e5d07f3b2962ab87ed28fcf74204577a712 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Mon, 22 Jul 2024 23:37:48 -0300
Subject: [PATCH 15/60] qmplay2: fetch submodules directly (get rid of
 fetchSubmodules)

---
 pkgs/by-name/qm/qmplay2/package.nix | 11 +++++++++++
 pkgs/by-name/qm/qmplay2/sources.nix | 15 +++++++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/qm/qmplay2/package.nix b/pkgs/by-name/qm/qmplay2/package.nix
index 9c2697827421..f28084047c7c 100644
--- a/pkgs/by-name/qm/qmplay2/package.nix
+++ b/pkgs/by-name/qm/qmplay2/package.nix
@@ -29,6 +29,13 @@ in
 stdenv.mkDerivation (finalAttrs: {
   inherit (sources.qmplay2) pname version src;
 
+  postPatch = ''
+    pushd src
+    cp -va ${sources.qmvk.src}/* qmvk/
+    chmod --recursive 744 qmvk
+    popd
+  '';
+
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -66,6 +73,10 @@ stdenv.mkDerivation (finalAttrs: {
     [ -e $out/bin/qmplay2 ] || ln -s $out/bin/QMPlay2 $out/bin/qmplay2
   '';
 
+  passthru = {
+    inherit sources;
+  };
+
   meta = {
     homepage = "https://github.com/zaps166/QMPlay2/";
     description = "Qt-based Multimedia player";
diff --git a/pkgs/by-name/qm/qmplay2/sources.nix b/pkgs/by-name/qm/qmplay2/sources.nix
index e32b640a6e47..1cd64fae7f98 100644
--- a/pkgs/by-name/qm/qmplay2/sources.nix
+++ b/pkgs/by-name/qm/qmplay2/sources.nix
@@ -12,10 +12,21 @@
         owner = "zaps166";
         repo = "QMPlay2";
         rev = self.version;
-        fetchSubmodules = true;
-        hash = "sha256-WIDGApvl+aaB3Vdv0sHY+FHWqzreWWd3/xOLV11YfxM=";
+        hash = "sha256-achnbloKJq4t7xwJ7Qn0bAEGjuLx8wiZK7+BOLYZaN0=";
       };
     };
   in
     self;
+
+  qmvk = {
+    pname = "qmvk";
+    version = "0-unstable-2024-03-30";
+
+    src = fetchFromGitHub {
+      owner = "zaps166";
+      repo = "QmVk";
+      rev = "50826653f34140afd03ccb7e8032715092b34446";
+      hash = "sha256-p2yt0PE5j9+YGOj3T1y/z9N3djbXzxh7h27xHCMnAwo=";
+    };
+  };
 }

From eec12ba4fd4a88ac0a219b8c4b72e1b092bf3efc Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 26 Jul 2024 09:23:08 -0300
Subject: [PATCH 16/60] qmplay2: create symlink at postInstall

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

diff --git a/pkgs/by-name/qm/qmplay2/package.nix b/pkgs/by-name/qm/qmplay2/package.nix
index f28084047c7c..89275e9f7d49 100644
--- a/pkgs/by-name/qm/qmplay2/package.nix
+++ b/pkgs/by-name/qm/qmplay2/package.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   # Because we think it is better to use only lowercase letters!
   # But sometimes we come across case-insensitive filesystems...
-  postFixup = ''
+  postInstall = ''
     [ -e $out/bin/qmplay2 ] || ln -s $out/bin/QMPlay2 $out/bin/qmplay2
   '';
 

From 3900d02aa87758b00c758040b489433d8ae48afb Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 3 Jul 2024 14:25:52 -0300
Subject: [PATCH 17/60] qmplay2: set strictDeps

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

diff --git a/pkgs/by-name/qm/qmplay2/package.nix b/pkgs/by-name/qm/qmplay2/package.nix
index 89275e9f7d49..48bee1bf7bb9 100644
--- a/pkgs/by-name/qm/qmplay2/package.nix
+++ b/pkgs/by-name/qm/qmplay2/package.nix
@@ -67,6 +67,8 @@ stdenv.mkDerivation (finalAttrs: {
     qt5.qttools
   ];
 
+  strictDeps = true;
+
   # Because we think it is better to use only lowercase letters!
   # But sometimes we come across case-insensitive filesystems...
   postInstall = ''

From f667a7e27034b8ad5e9ab96eefd315d2c5980c0a Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Thu, 25 Jul 2024 22:04:51 -0300
Subject: [PATCH 18/60] qmplay2: delete changelog link

Until a better idea for an unbreakable reference template appears.

(Maybe a local file ref?)
---
 pkgs/by-name/qm/qmplay2/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/qm/qmplay2/package.nix b/pkgs/by-name/qm/qmplay2/package.nix
index 48bee1bf7bb9..05b0861bc003 100644
--- a/pkgs/by-name/qm/qmplay2/package.nix
+++ b/pkgs/by-name/qm/qmplay2/package.nix
@@ -88,7 +88,6 @@ stdenv.mkDerivation (finalAttrs: {
       files, Rayman 2 music and chiptunes. It contains YouTube and MyFreeMP3
       browser.
     '';
-    changelog = "https://github.com/zaps166/QMPlay2/releases/tag/${finalAttrs.version}";
     license = lib.licenses.lgpl3Plus;
     mainProgram = "qmplay2";
     maintainers = with lib.maintainers; [ AndersonTorres kashw2 ];

From 466acbdd5088727d690420132c59250a78a01d51 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 26 Jul 2024 12:34:18 -0300
Subject: [PATCH 19/60] qmplay2: fix longDescription

Grammar and punctuation.
---
 pkgs/by-name/qm/qmplay2/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/qm/qmplay2/package.nix b/pkgs/by-name/qm/qmplay2/package.nix
index 05b0861bc003..345df6cf9420 100644
--- a/pkgs/by-name/qm/qmplay2/package.nix
+++ b/pkgs/by-name/qm/qmplay2/package.nix
@@ -84,9 +84,9 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Qt-based Multimedia player";
     longDescription = ''
       QMPlay2 is a video and audio player. It can play all formats supported by
-      FFmpeg, libmodplug (including J2B and SFX). It also supports Audio CD, raw
-      files, Rayman 2 music and chiptunes. It contains YouTube and MyFreeMP3
-      browser.
+      FFmpeg and libmodplug (including J2B and SFX). It also supports Audio CD,
+      raw files, Rayman 2 music, and chiptunes. It also contains YouTube and
+      MyFreeMP3 browser.
     '';
     license = lib.licenses.lgpl3Plus;
     mainProgram = "qmplay2";

From 5a499e703f2f5dafc6a1130c952574b15f7a39a8 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Mon, 22 Jul 2024 23:39:44 -0300
Subject: [PATCH 20/60] qmplay2: 24.04.07 -> 24.05.23

---
 pkgs/by-name/qm/qmplay2/package.nix | 22 +++++++++++++++++++---
 pkgs/by-name/qm/qmplay2/sources.nix | 10 +++++-----
 pkgs/top-level/all-packages.nix     |  3 +++
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/qm/qmplay2/package.nix b/pkgs/by-name/qm/qmplay2/package.nix
index 345df6cf9420..49258cc9bbf0 100644
--- a/pkgs/by-name/qm/qmplay2/package.nix
+++ b/pkgs/by-name/qm/qmplay2/package.nix
@@ -15,19 +15,25 @@
   libsidplayfp,
   libva,
   libxcb,
+  ninja,
   pkg-config,
   qt5,
+  qt6,
   stdenv,
   taglib,
   vulkan-headers,
   vulkan-tools,
+  # Configurable options
+  qtVersion ? "6", # Can be 5 or 6
 }:
 
 let
   sources = callPackage ./sources.nix { };
 in
+assert lib.elem qtVersion [ "5" "6" ];
 stdenv.mkDerivation (finalAttrs: {
-  inherit (sources.qmplay2) pname version src;
+  pname = sources.qmplay2.pname + "-qt" + qtVersion;
+  inherit (sources.qmplay2) version src;
 
   postPatch = ''
     pushd src
@@ -38,9 +44,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     cmake
+    ninja
     pkg-config
   ]
-  ++ [
+  ++ lib.optionals (qtVersion == "6") [
+    qt6.wrapQtAppsHook
+  ]
+  ++ lib.optionals (qtVersion == "5") [
     qt5.wrapQtAppsHook
   ];
 
@@ -62,7 +72,13 @@ stdenv.mkDerivation (finalAttrs: {
     vulkan-headers
     vulkan-tools
   ]
-  ++ [
+  ++ lib.optionals (qtVersion == "6") [
+    qt6.qt5compat
+    qt6.qtbase
+    qt6.qtsvg
+    qt6.qttools
+  ]
+  ++ lib.optionals (qtVersion == "5") [
     qt5.qtbase
     qt5.qttools
   ];
diff --git a/pkgs/by-name/qm/qmplay2/sources.nix b/pkgs/by-name/qm/qmplay2/sources.nix
index 1cd64fae7f98..e15de30ad5f2 100644
--- a/pkgs/by-name/qm/qmplay2/sources.nix
+++ b/pkgs/by-name/qm/qmplay2/sources.nix
@@ -6,13 +6,13 @@
   qmplay2 = let
     self = {
       pname = "qmplay2";
-      version = "24.04.07";
+      version = "24.05.23";
 
       src = fetchFromGitHub {
         owner = "zaps166";
         repo = "QMPlay2";
         rev = self.version;
-        hash = "sha256-achnbloKJq4t7xwJ7Qn0bAEGjuLx8wiZK7+BOLYZaN0=";
+        hash = "sha256-qh3Xaph8Siu6sLFdgEhCBmsgbtjllQXjVKTAdrlTmwA=";
       };
     };
   in
@@ -20,13 +20,13 @@
 
   qmvk = {
     pname = "qmvk";
-    version = "0-unstable-2024-03-30";
+    version = "0-unstable-2024-04-19";
 
     src = fetchFromGitHub {
       owner = "zaps166";
       repo = "QmVk";
-      rev = "50826653f34140afd03ccb7e8032715092b34446";
-      hash = "sha256-p2yt0PE5j9+YGOj3T1y/z9N3djbXzxh7h27xHCMnAwo=";
+      rev = "5c5c2942255820b6343afdfeea0405cd3b36870e";
+      hash = "sha256-viFM9N5PiSCgkGlxtrLFCVDIML/QyPiaPRX77RW2NNw=";
     };
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6f6a027b1077..6132f56fff68 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -33407,6 +33407,9 @@ with pkgs;
 
   qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { };
 
+  qmplay2-qt5 = qmplay2.override { qtVersion = "5"; };
+  qmplay2-qt6 = qmplay2.override { qtVersion = "6"; };
+
   qmidiarp = callPackage ../applications/audio/qmidiarp { };
 
   qmidinet = libsForQt5.callPackage ../applications/audio/qmidinet { };

From 644bdba6d08fa164e640fe6ff5ec539f54d0faf7 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Wed, 3 Jul 2024 16:07:25 -0300
Subject: [PATCH 21/60] qmplay2: 24.05.23 -> 24.06.16

---
 pkgs/by-name/qm/qmplay2/sources.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/qm/qmplay2/sources.nix b/pkgs/by-name/qm/qmplay2/sources.nix
index e15de30ad5f2..2eccd42a878a 100644
--- a/pkgs/by-name/qm/qmplay2/sources.nix
+++ b/pkgs/by-name/qm/qmplay2/sources.nix
@@ -6,13 +6,13 @@
   qmplay2 = let
     self = {
       pname = "qmplay2";
-      version = "24.05.23";
+      version = "24.06.16";
 
       src = fetchFromGitHub {
         owner = "zaps166";
         repo = "QMPlay2";
         rev = self.version;
-        hash = "sha256-qh3Xaph8Siu6sLFdgEhCBmsgbtjllQXjVKTAdrlTmwA=";
+        hash = "sha256-HoFyC/OFmthUYfyo6//+KmBIq06MPb5GmDekJbnsz5o=";
       };
     };
   in

From fb86fc7d25c76dc3a5460c79a2c370732c821b98 Mon Sep 17 00:00:00 2001
From: Anderson Torres <torres.anderson.85@protonmail.com>
Date: Fri, 26 Jul 2024 09:18:34 -0300
Subject: [PATCH 22/60] qmplay2: nixfmt-rfc-style

(Can someone explain what happened with buildInputs??)
---
 pkgs/by-name/qm/qmplay2/package.nix | 86 +++++++++++++++--------------
 pkgs/by-name/qm/qmplay2/sources.nix | 27 +++++----
 2 files changed, 58 insertions(+), 55 deletions(-)

diff --git a/pkgs/by-name/qm/qmplay2/package.nix b/pkgs/by-name/qm/qmplay2/package.nix
index 49258cc9bbf0..b1c87c6993f6 100644
--- a/pkgs/by-name/qm/qmplay2/package.nix
+++ b/pkgs/by-name/qm/qmplay2/package.nix
@@ -30,7 +30,10 @@
 let
   sources = callPackage ./sources.nix { };
 in
-assert lib.elem qtVersion [ "5" "6" ];
+assert lib.elem qtVersion [
+  "5"
+  "6"
+];
 stdenv.mkDerivation (finalAttrs: {
   pname = sources.qmplay2.pname + "-qt" + qtVersion;
   inherit (sources.qmplay2) version src;
@@ -42,46 +45,44 @@ stdenv.mkDerivation (finalAttrs: {
     popd
   '';
 
-  nativeBuildInputs = [
-    cmake
-    ninja
-    pkg-config
-  ]
-  ++ lib.optionals (qtVersion == "6") [
-    qt6.wrapQtAppsHook
-  ]
-  ++ lib.optionals (qtVersion == "5") [
-    qt5.wrapQtAppsHook
-  ];
+  nativeBuildInputs =
+    [
+      cmake
+      ninja
+      pkg-config
+    ]
+    ++ lib.optionals (qtVersion == "6") [ qt6.wrapQtAppsHook ]
+    ++ lib.optionals (qtVersion == "5") [ qt5.wrapQtAppsHook ];
 
-  buildInputs = [
-    alsa-lib
-    ffmpeg
-    fribidi
-    game-music-emu
-    libXdmcp
-    libXv
-    libass
-    libcddb
-    libcdio
-    libpulseaudio
-    libsidplayfp
-    libva
-    libxcb
-    taglib
-    vulkan-headers
-    vulkan-tools
-  ]
-  ++ lib.optionals (qtVersion == "6") [
-    qt6.qt5compat
-    qt6.qtbase
-    qt6.qtsvg
-    qt6.qttools
-  ]
-  ++ lib.optionals (qtVersion == "5") [
-    qt5.qtbase
-    qt5.qttools
-  ];
+  buildInputs =
+    [
+      alsa-lib
+      ffmpeg
+      fribidi
+      game-music-emu
+      libXdmcp
+      libXv
+      libass
+      libcddb
+      libcdio
+      libpulseaudio
+      libsidplayfp
+      libva
+      libxcb
+      taglib
+      vulkan-headers
+      vulkan-tools
+    ]
+    ++ lib.optionals (qtVersion == "6") [
+      qt6.qt5compat
+      qt6.qtbase
+      qt6.qtsvg
+      qt6.qttools
+    ]
+    ++ lib.optionals (qtVersion == "5") [
+      qt5.qtbase
+      qt5.qttools
+    ];
 
   strictDeps = true;
 
@@ -106,7 +107,10 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = lib.licenses.lgpl3Plus;
     mainProgram = "qmplay2";
-    maintainers = with lib.maintainers; [ AndersonTorres kashw2 ];
+    maintainers = with lib.maintainers; [
+      AndersonTorres
+      kashw2
+    ];
     platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/by-name/qm/qmplay2/sources.nix b/pkgs/by-name/qm/qmplay2/sources.nix
index 2eccd42a878a..e3cb9a89f2d6 100644
--- a/pkgs/by-name/qm/qmplay2/sources.nix
+++ b/pkgs/by-name/qm/qmplay2/sources.nix
@@ -1,21 +1,20 @@
-{
-  fetchFromGitHub,
-}:
+{ fetchFromGitHub }:
 
 {
-  qmplay2 = let
-    self = {
-      pname = "qmplay2";
-      version = "24.06.16";
+  qmplay2 =
+    let
+      self = {
+        pname = "qmplay2";
+        version = "24.06.16";
 
-      src = fetchFromGitHub {
-        owner = "zaps166";
-        repo = "QMPlay2";
-        rev = self.version;
-        hash = "sha256-HoFyC/OFmthUYfyo6//+KmBIq06MPb5GmDekJbnsz5o=";
+        src = fetchFromGitHub {
+          owner = "zaps166";
+          repo = "QMPlay2";
+          rev = self.version;
+          hash = "sha256-HoFyC/OFmthUYfyo6//+KmBIq06MPb5GmDekJbnsz5o=";
+        };
       };
-    };
-  in
+    in
     self;
 
   qmvk = {

From 47b3b812c9e46a6cc7353e615b6e12827d35503e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 27 Jul 2024 06:34:49 +0000
Subject: [PATCH 23/60] buildah-unwrapped: 1.36.0 -> 1.37.0

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

diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix
index 531e87df84bc..ff31e38d56a8 100644
--- a/pkgs/development/tools/buildah/default.nix
+++ b/pkgs/development/tools/buildah/default.nix
@@ -17,13 +17,13 @@
 
 buildGoModule rec {
   pname = "buildah";
-  version = "1.36.0";
+  version = "1.37.0";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "buildah";
     rev = "v${version}";
-    hash = "sha256-Ttz1D/jFbxFfpbT2VAkcao2AFwFRD8PLrH8yDSYt3AI=";
+    hash = "sha256-WT1ij2jDEKavYREYYYKl6H27QOuGDAxnWSz+mbvJ5UA=";
   };
 
   outputs = [ "out" "man" ];

From 2203c6b5e3f52e44b73b895f83e441857c151a08 Mon Sep 17 00:00:00 2001
From: Luna Simons <luna@bddvlpr.com>
Date: Sun, 28 Jul 2024 12:42:32 +0200
Subject: [PATCH 24/60] redocly: 1.18.0 -> 1.18.1

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

diff --git a/pkgs/by-name/re/redocly/package.nix b/pkgs/by-name/re/redocly/package.nix
index 77cabb05fa1f..198d50270259 100644
--- a/pkgs/by-name/re/redocly/package.nix
+++ b/pkgs/by-name/re/redocly/package.nix
@@ -8,16 +8,16 @@
 
 buildNpmPackage rec {
   pname = "redocly";
-  version = "1.18.0";
+  version = "1.18.1";
 
   src = fetchFromGitHub {
     owner = "Redocly";
     repo = "redocly-cli";
     rev = "@redocly/cli@${version}";
-    hash = "sha256-Wcnq6hOgZb/HjTL1vb70d69LwFqRsBrgWHKyjYnauEg=";
+    hash = "sha256-Y09tGm3Sje8gd+6tUyBTCt7HjL2CQ/vo/ExLDnywvcQ=";
   };
 
-  npmDepsHash = "sha256-mHwabPif4B1kzqA5Y9WBEr17c3tg0IsBGcRcWnQqGD0=";
+  npmDepsHash = "sha256-WzMFKMW/YyAH3ZoOeIcXIum15cJmPGp96xSYb9QCaWI=";
 
   npmBuildScript = "prepare";
 

From 50ee2b98cfd94fba2aead3e04a33b8f938000784 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Jul 2024 09:20:30 +0000
Subject: [PATCH 25/60] garnet: 1.0.15 -> 1.0.16

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

diff --git a/pkgs/by-name/ga/garnet/package.nix b/pkgs/by-name/ga/garnet/package.nix
index 45d46d5bebaa..4e038635492c 100644
--- a/pkgs/by-name/ga/garnet/package.nix
+++ b/pkgs/by-name/ga/garnet/package.nix
@@ -7,13 +7,13 @@
 }:
 buildDotnetModule rec {
   pname = "garnet";
-  version = "1.0.15";
+  version = "1.0.16";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "garnet";
     rev = "v${version}";
-    hash = "sha256-SpkhOztUh28N853+6BBQnVRBgphxJARLJXQzmXJwPyY=";
+    hash = "sha256-0c6iJMSB9ThJVookibZL5CoAhrVMtY6oHYn92nN0114=";
   };
 
   projectFile = "main/GarnetServer/GarnetServer.csproj";

From 69cbd04283605f6ff02da61b5259c79c91f9adc0 Mon Sep 17 00:00:00 2001
From: redyf <mateusalvespereira7@gmail.com>
Date: Wed, 31 Jul 2024 11:29:56 -0300
Subject: [PATCH 26/60] bruno: 1.22.0 -> 1.23.0

https://github.com/usebruno/bruno/releases/tag/v1.23.0
---
 pkgs/by-name/br/bruno/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix
index 751dc2fbc74c..fc10b7e034e3 100644
--- a/pkgs/by-name/br/bruno/package.nix
+++ b/pkgs/by-name/br/bruno/package.nix
@@ -28,13 +28,13 @@ let
 in
 buildNpmPackage' rec {
   pname = "bruno";
-  version = "1.22.0";
+  version = "1.23.0";
 
   src = fetchFromGitHub {
     owner = "usebruno";
     repo = "bruno";
     rev = "v${version}";
-    hash = "sha256-RcMmW1+XbQSVeaYnK7y8/WdQLYOIozyt9OCDAsSZ3HU=";
+    hash = "sha256-zbQlmxrvA2rZLEGmhj7MkVP5SmJdhhL9F3wRrB97DJs=";
 
     postFetch = ''
       ${lib.getExe npm-lockfile-fix} $out/package-lock.json

From 7f2052d6ff469d18ffcc46d087372a7e2d20975f Mon Sep 17 00:00:00 2001
From: Phil Dyer <phildyer@protonmail.com>
Date: Fri, 10 May 2024 17:38:15 +1000
Subject: [PATCH 27/60] ryzen-monitor-ng: Fix build

makeTargets is not used by the default builder, and was not
calling the necessary make targets.

Added `make clean` to `preBuild` to ensure old files are removed
before building.
---
 pkgs/by-name/ry/ryzen-monitor-ng/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ry/ryzen-monitor-ng/package.nix b/pkgs/by-name/ry/ryzen-monitor-ng/package.nix
index 5bcb65be3622..570cc9ca3cf4 100644
--- a/pkgs/by-name/ry/ryzen-monitor-ng/package.nix
+++ b/pkgs/by-name/ry/ryzen-monitor-ng/package.nix
@@ -14,13 +14,14 @@ stdenv.mkDerivation {
     hash = "sha256-fcW2fEsCFliRnMFnboR0jchzVIlCYbr2AE6AS06cb6o=";
   };
 
-  ## Remove binaries committed into upstream repo
+  # Upstream repo contains pre-compiled binaries and object files
+  # that are out of date.
+  # These need to be removed before build stage.
   preBuild = ''
     rm src/ryzen_monitor
+    make clean
   '';
 
-  makeTargets = [ "clean" "install" ];
-
   installPhase = ''
     runHook preInstall
 

From ffa2521acbd4369355fd3495212a53c2f56d6abe Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Wed, 31 Jul 2024 23:56:02 +0530
Subject: [PATCH 28/60] ryzen-monitor-ng: remove custom installPhase in favor
 of makeFlags

---
 pkgs/by-name/ry/ryzen-monitor-ng/package.nix | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ry/ryzen-monitor-ng/package.nix b/pkgs/by-name/ry/ryzen-monitor-ng/package.nix
index 570cc9ca3cf4..7c8f577e5eef 100644
--- a/pkgs/by-name/ry/ryzen-monitor-ng/package.nix
+++ b/pkgs/by-name/ry/ryzen-monitor-ng/package.nix
@@ -22,14 +22,9 @@ stdenv.mkDerivation {
     make clean
   '';
 
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/bin
-    mv ./src/ryzen_monitor $out/bin
-
-    runHook postInstall
-  '';
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+  ];
 
   meta = with lib; {
     description = "Access Ryzen SMU information exposed by the ryzen_smu driver";

From c5e393f54baf98cd05099c3cb07e377ac2c7c0b2 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Wed, 31 Jul 2024 23:59:40 +0530
Subject: [PATCH 29/60] ryzen_monitor_ng: add updateScript, update homepage

apply nixfmt-rfc-style

Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com>
---
 pkgs/by-name/ry/ryzen-monitor-ng/package.nix | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ry/ryzen-monitor-ng/package.nix b/pkgs/by-name/ry/ryzen-monitor-ng/package.nix
index 7c8f577e5eef..75826b331683 100644
--- a/pkgs/by-name/ry/ryzen-monitor-ng/package.nix
+++ b/pkgs/by-name/ry/ryzen-monitor-ng/package.nix
@@ -1,4 +1,9 @@
-{ lib, stdenv, fetchFromGitHub }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  unstableGitUpdater,
+}:
 
 stdenv.mkDerivation {
   pname = "ryzen-monitor-ng";
@@ -22,14 +27,14 @@ stdenv.mkDerivation {
     make clean
   '';
 
-  makeFlags = [
-    "PREFIX=${placeholder "out"}"
-  ];
+  makeFlags = [ "PREFIX=${placeholder "out"}" ];
+
+  passthru.updateScript = unstableGitUpdater { };
 
   meta = with lib; {
     description = "Access Ryzen SMU information exposed by the ryzen_smu driver";
-    homepage = "https://github.com/mann1x/ryzen_monitor_ng";
-    changelog = "https://github.com/mann1x/ryzen_monitor_ng/blob/master/CHANGELOG.md";
+    homepage = "https://github.com/plasmin/ryzen_monitor_ng";
+    changelog = "https://github.com/plasmin/ryzen_monitor_ng/blob/master/CHANGELOG.md";
     license = licenses.agpl3Only;
     platforms = [ "x86_64-linux" ];
     maintainers = with maintainers; [ phdyellow ];

From 6b987b797186b565ff917a8f9cfc00bba699e76b Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Thu, 1 Aug 2024 00:04:11 +0530
Subject: [PATCH 30/60] ryzen-monitor-ng: moved cleanup to postfetch

Signed-off-by: John Titor <50095635+JohnRTitor@users.noreply.github.com>
---
 pkgs/by-name/ry/ryzen-monitor-ng/package.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/ry/ryzen-monitor-ng/package.nix b/pkgs/by-name/ry/ryzen-monitor-ng/package.nix
index 75826b331683..044331da9e47 100644
--- a/pkgs/by-name/ry/ryzen-monitor-ng/package.nix
+++ b/pkgs/by-name/ry/ryzen-monitor-ng/package.nix
@@ -16,17 +16,16 @@ stdenv.mkDerivation {
     owner = "plasmin";
     repo = "ryzen_monitor_ng";
     rev = "8b7854791d78de731a45ce7d30dd17983228b7b1";
-    hash = "sha256-fcW2fEsCFliRnMFnboR0jchzVIlCYbr2AE6AS06cb6o=";
+    hash = "sha256-xdYNtXCbNy3/y5OAHZEi9KgPtwr1LTtLWAZC5DDCfmE=";
+    # Upstream repo contains pre-compiled binaries and object files
+    # that are out of date.
+    # These need to be removed before build stage.
+    postFetch = ''
+      rm "$out/src/ryzen_monitor"
+      make -C "$out" clean
+    '';
   };
 
-  # Upstream repo contains pre-compiled binaries and object files
-  # that are out of date.
-  # These need to be removed before build stage.
-  preBuild = ''
-    rm src/ryzen_monitor
-    make clean
-  '';
-
   makeFlags = [ "PREFIX=${placeholder "out"}" ];
 
   passthru.updateScript = unstableGitUpdater { };

From 8b63ff300906ccbe0a899a332f6310bf8eab27d6 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Tue, 30 Jul 2024 15:02:05 -0400
Subject: [PATCH 31/60] phraze: 0.3.12 -> 0.3.13

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

diff --git a/pkgs/by-name/ph/phraze/package.nix b/pkgs/by-name/ph/phraze/package.nix
index bffa86e107ee..4bc028f3205b 100644
--- a/pkgs/by-name/ph/phraze/package.nix
+++ b/pkgs/by-name/ph/phraze/package.nix
@@ -9,18 +9,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "phraze";
-  version = "0.3.12";
+  version = "0.3.13";
 
   src = fetchFromGitHub {
     owner = "sts10";
     repo = "phraze";
     rev = "v${version}";
-    hash = "sha256-lW7oYivIDGYg78MgcLFFNyxciVk+wKU/OBzWYx3KwPI=";
+    hash = "sha256-xjkS1Ehqh2LfuIwAtj6V7Q9DcuERk7PyJKJEuDE7A34=";
   };
 
   doCheck = true;
 
-  cargoHash = "sha256-kFk04YKDYiABWtild6aaP9H8gt/TuckOWRJE69dAXGU=";
+  cargoHash = "sha256-jsQlcGRZqa4HHUS3Xc9OZUbI6pHalt9A3fVaz+Th1l0=";
 
   passthru = {
     updateScript = nix-update-script { };

From 4c5f6a1636d413d10bab4ecbff17117c1fef5feb Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Tue, 30 Jul 2024 15:04:03 -0400
Subject: [PATCH 32/60] phraze: add myself as maintainer

---
 pkgs/by-name/ph/phraze/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ph/phraze/package.nix b/pkgs/by-name/ph/phraze/package.nix
index 4bc028f3205b..f227669535c8 100644
--- a/pkgs/by-name/ph/phraze/package.nix
+++ b/pkgs/by-name/ph/phraze/package.nix
@@ -34,7 +34,10 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/sts10/phraze";
     changelog = "https://github.com/sts10/phraze/releases/tag/v${version}";
     license = lib.licenses.mpl20;
-    maintainers = with lib.maintainers; [ x123 ];
+    maintainers = with lib.maintainers; [
+      x123
+      donovanglover
+    ];
     mainProgram = "phraze";
   };
 }

From b6fdaa940fa4c53fec8bbe56e2e73541b79b2237 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Wed, 31 Jul 2024 16:20:12 -0400
Subject: [PATCH 33/60] phraze: install man page and shell completions

---
 pkgs/by-name/ph/phraze/package.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/by-name/ph/phraze/package.nix b/pkgs/by-name/ph/phraze/package.nix
index f227669535c8..0159f2e5ec58 100644
--- a/pkgs/by-name/ph/phraze/package.nix
+++ b/pkgs/by-name/ph/phraze/package.nix
@@ -5,6 +5,7 @@
   nix-update-script,
   phraze,
   rustPlatform,
+  installShellFiles,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -22,6 +23,8 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-jsQlcGRZqa4HHUS3Xc9OZUbI6pHalt9A3fVaz+Th1l0=";
 
+  nativeBuildInputs = [ installShellFiles ];
+
   passthru = {
     updateScript = nix-update-script { };
     tests = {
@@ -29,6 +32,15 @@ rustPlatform.buildRustPackage rec {
     };
   };
 
+  postInstall = ''
+    installManPage target/man/phraze.1
+
+    installShellCompletion --cmd phraze \
+      --bash target/completions/phraze.bash \
+      --fish target/completions/phraze.fish \
+      --zsh target/completions/_phraze
+  '';
+
   meta = {
     description = "Generate random passphrases";
     homepage = "https://github.com/sts10/phraze";

From 28adb2dab2cce2bfd868d52bab42097710b4dd8b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 Aug 2024 01:03:12 +0000
Subject: [PATCH 34/60] python312Packages.recline: 2024.6 -> 2024.7.1

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

diff --git a/pkgs/development/python-modules/recline/default.nix b/pkgs/development/python-modules/recline/default.nix
index 842c57a4ec66..b60e2b6ebc19 100644
--- a/pkgs/development/python-modules/recline/default.nix
+++ b/pkgs/development/python-modules/recline/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "recline";
-  version = "2024.6";
+  version = "2024.7.1";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "NetApp";
     repo = "recline";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-wVUM5vkavdLDtwRlbtVlVaBOXX+7tcB+SxYe1jZdq9I=";
+    sha256 = "sha256-Qc4oofuhSZ2S5zuCY9Ce9ISldYI3MDUJXFc8VcXdLIU=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 2324618f659c61ccec4094510df8af95be94980f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 Aug 2024 02:04:19 +0000
Subject: [PATCH 35/60] python312Packages.dploot: 2.7.3 -> 3.0.0

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

diff --git a/pkgs/development/python-modules/dploot/default.nix b/pkgs/development/python-modules/dploot/default.nix
index afafa69c8b80..13ea26e68c2c 100644
--- a/pkgs/development/python-modules/dploot/default.nix
+++ b/pkgs/development/python-modules/dploot/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "dploot";
-  version = "2.7.3";
+  version = "3.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-YlRXUSCzVRXxRQcmPzTeyPQ3zK+UlhO9BmZVx6qVRpc=";
+    hash = "sha256-G39dzP5A6ZySo7AhDIZWXjhtk2zm15wSnrdknLqHHcY=";
   };
 
   pythonRelaxDeps = [

From 648442d61e85d0e9fcc3f040ea2dfd1b7f59ca0b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 Aug 2024 02:27:03 +0000
Subject: [PATCH 36/60] python312Packages.linear-garage-door: 0.2.9 -> 0.2.10

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

diff --git a/pkgs/development/python-modules/linear-garage-door/default.nix b/pkgs/development/python-modules/linear-garage-door/default.nix
index d3a0e21faa00..656f0c40e517 100644
--- a/pkgs/development/python-modules/linear-garage-door/default.nix
+++ b/pkgs/development/python-modules/linear-garage-door/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "linear-garage-door";
-  version = "0.2.9";
+  version = "0.2.10";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "IceBotYT";
     repo = "linear-garage-door";
     rev = "refs/tags/${version}";
-    hash = "sha256-hWWJgZnEItYaSxka7zBHPeVlTEiOqRnA2vg6/MvpJGE=";
+    hash = "sha256-ibOCqy7krIVC7N75SwEyUII3Tknb60nwA+zGbjOENv4=";
   };
 
   postPatch = ''

From a81e2b3e51aca18460412c133ca52028cb1d0551 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 Aug 2024 03:43:10 +0000
Subject: [PATCH 37/60] python312Packages.githubkit: 0.11.7 -> 0.11.8

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

diff --git a/pkgs/development/python-modules/githubkit/default.nix b/pkgs/development/python-modules/githubkit/default.nix
index b24eeacc4030..5cee6ace0b9b 100644
--- a/pkgs/development/python-modules/githubkit/default.nix
+++ b/pkgs/development/python-modules/githubkit/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "githubkit";
-  version = "0.11.7";
+  version = "0.11.8";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "yanyongyu";
     repo = "githubkit";
     rev = "refs/tags/v${version}";
-    hash = "sha256-bh01m/L1ubQGc4EoHw8If/6yF64M5CsifSwVezZjFDQ=";
+    hash = "sha256-FTNLyCcwDU6EssQDJlwtmA7cQj57fsOaecvbpwswirU=";
   };
 
   postPatch = ''

From 2e429e4d63b4a12ed93a20aec254adfc2a2d54a2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 1 Aug 2024 09:52:07 +0200
Subject: [PATCH 38/60] python312Packages.linear-garage-door: refactor

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

diff --git a/pkgs/development/python-modules/linear-garage-door/default.nix b/pkgs/development/python-modules/linear-garage-door/default.nix
index 656f0c40e517..1a8bfb796410 100644
--- a/pkgs/development/python-modules/linear-garage-door/default.nix
+++ b/pkgs/development/python-modules/linear-garage-door/default.nix
@@ -29,9 +29,9 @@ buildPythonPackage rec {
       -e "/--no-cov/d"
   '';
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     aiohttp
     dnspython
     tenacity

From 994cf812fc642d3e0a31eb39a78e152844ca2e1e Mon Sep 17 00:00:00 2001
From: Peter Kling <peter.kling@uni-hamburg.de>
Date: Sun, 14 Jul 2024 20:15:37 +0200
Subject: [PATCH 39/60] maintainers: add pitkling

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ec92f8cba451..3dfe66345892 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -15887,6 +15887,11 @@
     githubId = 1830959;
     name = "Piper McCorkle";
   };
+  pitkling = {
+    github = "pitkling";
+    githubId = 1018801;
+    name = "Peter Kling";
+  };
   piturnah = {
     email = "peterhebden6@gmail.com";
     github = "Piturnah";

From 25e042c3d418bf36ea7f662bc3947bb082566fb8 Mon Sep 17 00:00:00 2001
From: Peter Kling <peter.kling@uni-hamburg.de>
Date: Tue, 9 Jul 2024 21:39:22 +0200
Subject: [PATCH 40/60] libfprint-2-tod1-broadcom: init at 5.12.018

---
 .../li/libfprint-2-tod1-broadcom/package.nix  | 85 +++++++++++++++++++
 .../libfprint-2-tod1-broadcom/wrapper-lib.c   | 23 +++++
 2 files changed, 108 insertions(+)
 create mode 100644 pkgs/by-name/li/libfprint-2-tod1-broadcom/package.nix
 create mode 100644 pkgs/by-name/li/libfprint-2-tod1-broadcom/wrapper-lib.c

diff --git a/pkgs/by-name/li/libfprint-2-tod1-broadcom/package.nix b/pkgs/by-name/li/libfprint-2-tod1-broadcom/package.nix
new file mode 100644
index 000000000000..0a9da8a0cb1a
--- /dev/null
+++ b/pkgs/by-name/li/libfprint-2-tod1-broadcom/package.nix
@@ -0,0 +1,85 @@
+{
+  autoPatchelfHook,
+  fetchzip,
+  lib,
+  libfprint-tod,
+  openssl,
+  patchelfUnstable, # have to use patchelfUnstable to support --rename-dynamic-symbols
+  stdenv,
+}:
+
+# Based on ideas from (using a wrapper library to redirect fopen() calls to firmware files):
+#   * https://tapesoftware.net/replace-symbol/
+#   * https://github.com/NixOS/nixpkgs/pull/260715
+let
+  pname = "libfprint-2-tod1-broadcom";
+  version = "5.12.018";
+
+  src = fetchzip {
+    url = "http://dell.archive.canonical.com/updates/pool/public/libf/${pname}/${pname}_${version}.orig.tar.gz";
+    hash = "sha256-0C2PpYpEJNrU+8NT95w4QV0J5nHQisMY94Czw3jQOzw=";
+    pname = "${pname}-unpacked";
+    inherit version;
+  };
+
+  # wraps `fopen()` for finding firmware files
+  wrapperLibName = "wrapper-lib.so";
+  wrapperLib = stdenv.mkDerivation {
+    pname = "${pname}-wrapper-lib";
+    inherit version;
+
+    src = ./.;
+
+    postPatch = ''
+      substitute wrapper-lib.c lib.c \
+        --subst-var-by to "${src}/var/lib/fprint/fw"
+      cc -fPIC -shared lib.c -o ${wrapperLibName}
+    '';
+
+    installPhase = ''
+      runHook preInstall
+      install -D -t $out/lib ${wrapperLibName}
+      runHook postInstall
+    '';
+  };
+in
+stdenv.mkDerivation {
+  inherit src pname version;
+
+  buildInputs = [
+    libfprint-tod
+    openssl
+    wrapperLib
+  ];
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    patchelfUnstable
+  ];
+
+  installPhase = ''
+    runHook preInstall
+    install -D -t "$out/lib/libfprint-2/tod-1/" -m 644 -v usr/lib/x86_64-linux-gnu/libfprint-2/tod-1/libfprint-2-tod-1-broadcom.so
+    install -D -t "$out/lib/udev/rules.d/"      -m 644 -v lib/udev/rules.d/60-libfprint-2-device-broadcom.rules
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    echo fopen64 fopen_wrapper > fopen_name_map
+    patchelf \
+      --rename-dynamic-symbols fopen_name_map \
+      --add-needed ${wrapperLibName} \
+      "$out/lib/libfprint-2/tod-1/libfprint-2-tod-1-broadcom.so"
+  '';
+
+  passthru.driverPath = "/lib/libfprint-2/tod-1";
+
+  meta = with lib; {
+    description = "Broadcom driver module for libfprint-2-tod Touch OEM Driver (from Dell)";
+    homepage = "http://dell.archive.canonical.com/updates/pool/public/libf/libfprint-2-tod1-broadcom/";
+    license = licenses.unfree;
+    maintainers = with maintainers; [ pitkling ];
+    platforms = [ "x86_64-linux" ];
+    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+  };
+}
diff --git a/pkgs/by-name/li/libfprint-2-tod1-broadcom/wrapper-lib.c b/pkgs/by-name/li/libfprint-2-tod1-broadcom/wrapper-lib.c
new file mode 100644
index 000000000000..c6909ae55a52
--- /dev/null
+++ b/pkgs/by-name/li/libfprint-2-tod1-broadcom/wrapper-lib.c
@@ -0,0 +1,23 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static const char from[] =  "/var/lib/fprint/fw";
+static const char to[]   = "@to@";
+
+FILE* fopen_wrapper(const char* fn, const char* mode) {
+    size_t fn_len = strlen(fn);
+    size_t from_len = strlen(from);
+    if (fn_len > from_len && memcmp(fn, from, from_len) == 0) {
+        size_t to_len = strlen(to);
+        char* rewritten = calloc(fn_len + (to_len - from_len) + 1, 1);
+        memcpy(rewritten, to, to_len);
+        memcpy(rewritten + to_len, fn + from_len, fn_len - from_len);
+
+        printf("fopen_wrapper.c: Replacing path '%s' with '%s'\n", fn, rewritten);
+        FILE* result = fopen(rewritten, mode);
+        free(rewritten);
+        return result;
+    }
+    return fopen(fn, mode);
+}

From 3399a775842df763632593a374937039cf4e004a Mon Sep 17 00:00:00 2001
From: Peter Kling <peter.kling@uni-hamburg.de>
Date: Thu, 1 Aug 2024 14:36:31 +0200
Subject: [PATCH 41/60] avoid unnecessary files in wrapper-lib's source
 directory in the nix store

---
 .../by-name/li/libfprint-2-tod1-broadcom/package.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/libfprint-2-tod1-broadcom/package.nix b/pkgs/by-name/li/libfprint-2-tod1-broadcom/package.nix
index 0a9da8a0cb1a..449f7aba3702 100644
--- a/pkgs/by-name/li/libfprint-2-tod1-broadcom/package.nix
+++ b/pkgs/by-name/li/libfprint-2-tod1-broadcom/package.nix
@@ -22,16 +22,22 @@ let
     inherit version;
   };
 
-  # wraps `fopen()` for finding firmware files
   wrapperLibName = "wrapper-lib.so";
+  wrapperLibSource = "wrapper-lib.c";
+
+  # wraps `fopen()` for finding firmware files
   wrapperLib = stdenv.mkDerivation {
     pname = "${pname}-wrapper-lib";
     inherit version;
 
-    src = ./.;
+    src = builtins.path {
+      name = "${pname}-source";
+      path = ./.;
+      filter = (path: type: baseNameOf path == wrapperLibSource);
+    };
 
     postPatch = ''
-      substitute wrapper-lib.c lib.c \
+      substitute ${wrapperLibSource} lib.c \
         --subst-var-by to "${src}/var/lib/fprint/fw"
       cc -fPIC -shared lib.c -o ${wrapperLibName}
     '';

From cf59de18df4e529d840be27d9ecb53e3a68c97ea Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 21 Jul 2024 13:48:51 +0100
Subject: [PATCH 42/60] harvid: move to `pkgs/by-name`

---
 .../video/harvid/default.nix => by-name/ha/harvid/package.nix}  | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{tools/video/harvid/default.nix => by-name/ha/harvid/package.nix} (100%)

diff --git a/pkgs/tools/video/harvid/default.nix b/pkgs/by-name/ha/harvid/package.nix
similarity index 100%
rename from pkgs/tools/video/harvid/default.nix
rename to pkgs/by-name/ha/harvid/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b210c70cadb0..c35509b0f2a6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3812,8 +3812,6 @@ with pkgs;
 
   harsh = callPackage ../applications/misc/harsh { };
 
-  harvid = callPackage ../tools/video/harvid { };
-
   headset = callPackage ../applications/audio/headset { };
 
   hilbish = callPackage ../shells/hilbish { };

From 6640228da685dc1973b931e34602e8bb229b2462 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 21 Jul 2024 13:49:09 +0100
Subject: [PATCH 43/60] harvid: format with `nixfmt-rfc-style`

---
 pkgs/by-name/ha/harvid/package.nix | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ha/harvid/package.nix b/pkgs/by-name/ha/harvid/package.nix
index 2860e5f22280..3d0879b15d81 100644
--- a/pkgs/by-name/ha/harvid/package.nix
+++ b/pkgs/by-name/ha/harvid/package.nix
@@ -1,4 +1,13 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, ffmpeg_4, libjpeg, libpng, pkg-config }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchpatch,
+  ffmpeg_4,
+  libjpeg,
+  libpng,
+  pkg-config,
+}:
 
 stdenv.mkDerivation rec {
   pname = "harvid";
@@ -23,9 +32,16 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkg-config ];
 
-  buildInputs = [ ffmpeg_4 libjpeg libpng ];
+  buildInputs = [
+    ffmpeg_4
+    libjpeg
+    libpng
+  ];
 
-  makeFlags = [ "DESTDIR=$(out)" "libdir=\"/lib\"" ];
+  makeFlags = [
+    "DESTDIR=$(out)"
+    "libdir=\"/lib\""
+  ];
 
   postInstall = ''
     mkdir -p $out/bin
@@ -35,8 +51,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with lib; {
-    description =
-      "Decodes still images from movie files and serves them via HTTP";
+    description = "Decodes still images from movie files and serves them via HTTP";
     longDescription = ''
       harvid's intended use-case is to efficiently provide frame-accurate data
       and act as second level cache for rendering the video-timeline in Ardour,

From 17ee07c43d072e759132e6a5c44980d3ffe8d68d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 Aug 2024 16:15:17 +0000
Subject: [PATCH 44/60] irpf: 2024-1.2 -> 2024-1.3

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

diff --git a/pkgs/by-name/ir/irpf/package.nix b/pkgs/by-name/ir/irpf/package.nix
index ad21b37c5c73..1b4c49e57dd0 100644
--- a/pkgs/by-name/ir/irpf/package.nix
+++ b/pkgs/by-name/ir/irpf/package.nix
@@ -12,7 +12,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "irpf";
-  version = "2024-1.2";
+  version = "2024-1.3";
 
   # https://www.gov.br/receitafederal/pt-br/centrais-de-conteudo/download/pgd/dirpf
   # Para outros sistemas operacionais -> Multi
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     year = lib.head (lib.splitVersion finalAttrs.version);
   in fetchzip {
     url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${finalAttrs.version}.zip";
-    hash = "sha256-gwYWNnvpGej9B1EyFswYGYXh4i4wiyOG67VN1PWX3A0=";
+    hash = "sha256-UMzoQSSlmOi7TIqPF0vfeelum5JSa6ne4c7ZFREuDr8=";
   };
 
   passthru.updateScript = writeScript "update-irpf" ''

From e6e55fbe78f041f716c869d3a10be68af9cabef2 Mon Sep 17 00:00:00 2001
From: Peter Kling <peter.kling@uni-hamburg.de>
Date: Thu, 1 Aug 2024 16:02:42 +0200
Subject: [PATCH 45/60] better names for involved nix store paths

---
 pkgs/by-name/li/libfprint-2-tod1-broadcom/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libfprint-2-tod1-broadcom/package.nix b/pkgs/by-name/li/libfprint-2-tod1-broadcom/package.nix
index 449f7aba3702..842f803c0af0 100644
--- a/pkgs/by-name/li/libfprint-2-tod1-broadcom/package.nix
+++ b/pkgs/by-name/li/libfprint-2-tod1-broadcom/package.nix
@@ -31,9 +31,9 @@ let
     inherit version;
 
     src = builtins.path {
-      name = "${pname}-source";
+      name = "${pname}-wrapper-lib-source";
       path = ./.;
-      filter = (path: type: baseNameOf path == wrapperLibSource);
+      filter = path: type: baseNameOf path == wrapperLibSource;
     };
 
     postPatch = ''

From e22163d6c9f5f718dc07c8fd13aed742af49e796 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Thu, 1 Aug 2024 17:02:03 +0100
Subject: [PATCH 46/60] harvid: modernize

---
 pkgs/by-name/ha/harvid/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ha/harvid/package.nix b/pkgs/by-name/ha/harvid/package.nix
index 3d0879b15d81..58d8347cabc4 100644
--- a/pkgs/by-name/ha/harvid/package.nix
+++ b/pkgs/by-name/ha/harvid/package.nix
@@ -9,14 +9,14 @@
   pkg-config,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "harvid";
   version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "x42";
     repo = "harvid";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-qt6aep7iMF8/lnlT2wLqu6LkFDqzdfsGLZvrOlXttG8=";
   };
 
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     rm -r $out/usr
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Decodes still images from movie files and serves them via HTTP";
     longDescription = ''
       harvid's intended use-case is to efficiently provide frame-accurate data
@@ -60,9 +60,9 @@ stdenv.mkDerivation rec {
       processor.
     '';
     homepage = "http://x42.github.io/harvid";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ mitchmindtree ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.mitchmindtree ];
     mainProgram = "harvid";
   };
-}
+})

From 8d3f0d9f74c5ecce78ebb9e033f62c595c00ebf5 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Thu, 1 Aug 2024 17:02:03 +0100
Subject: [PATCH 47/60] harvid: add update script

---
 pkgs/by-name/ha/harvid/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ha/harvid/package.nix b/pkgs/by-name/ha/harvid/package.nix
index 58d8347cabc4..eb4457de5884 100644
--- a/pkgs/by-name/ha/harvid/package.nix
+++ b/pkgs/by-name/ha/harvid/package.nix
@@ -7,6 +7,7 @@
   libjpeg,
   libpng,
   pkg-config,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -50,6 +51,8 @@ stdenv.mkDerivation (finalAttrs: {
     rm -r $out/usr
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Decodes still images from movie files and serves them via HTTP";
     longDescription = ''

From 7b3a7652b51232de6c5aab6cbcfc51e99a611417 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Thu, 1 Aug 2024 17:26:29 +0100
Subject: [PATCH 48/60] harvid: 0.9.0 -> 0.9.1

Diff: https://github.com/x42/harvid/compare/v0.9.0...v0.9.1
---
 pkgs/by-name/ha/harvid/package.nix | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/ha/harvid/package.nix b/pkgs/by-name/ha/harvid/package.nix
index eb4457de5884..3e4ce3e39517 100644
--- a/pkgs/by-name/ha/harvid/package.nix
+++ b/pkgs/by-name/ha/harvid/package.nix
@@ -2,35 +2,24 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
+  pkg-config,
   ffmpeg_4,
   libjpeg,
   libpng,
-  pkg-config,
   nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "harvid";
-  version = "0.9.0";
+  version = "0.9.1";
 
   src = fetchFromGitHub {
     owner = "x42";
     repo = "harvid";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-qt6aep7iMF8/lnlT2wLqu6LkFDqzdfsGLZvrOlXttG8=";
+    sha256 = "sha256-p0W+rKHH/iuGOcRjl6b4s6jQYkm7bqWCz849SDI/7fQ=";
   };
 
-  patches = [
-    # Fix pending upstream inclusion to support parallel builds:
-    #   https://github.com/x42/harvid/pull/10
-    (fetchpatch {
-      name = "parallel-build.patch";
-      url = "https://github.com/x42/harvid/commit/a3f85c57ad2559558706d9b22989de36452704d9.patch";
-      sha256 = "sha256-0aBfM/4XEqM7C1nFw996IVwaeL0tNgMUQ1C3kblOobI=";
-    })
-  ];
-
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [

From e3c7c5525a8dec352011d99b81394605913fcb40 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 21 Jul 2024 13:43:41 +0100
Subject: [PATCH 49/60] harvid: unpin FFmpeg 4

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

diff --git a/pkgs/by-name/ha/harvid/package.nix b/pkgs/by-name/ha/harvid/package.nix
index 3e4ce3e39517..35d974a49346 100644
--- a/pkgs/by-name/ha/harvid/package.nix
+++ b/pkgs/by-name/ha/harvid/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   pkg-config,
-  ffmpeg_4,
+  ffmpeg,
   libjpeg,
   libpng,
   nix-update-script,
@@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [
-    ffmpeg_4
+    ffmpeg
     libjpeg
     libpng
   ];

From 2042af5d59426c74cebdd7f43b90bb484da31b12 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 21 Jul 2024 13:43:41 +0100
Subject: [PATCH 50/60] harvid: simplify installation

---
 pkgs/by-name/ha/harvid/package.nix | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/pkgs/by-name/ha/harvid/package.nix b/pkgs/by-name/ha/harvid/package.nix
index 35d974a49346..514e53cc5a8c 100644
--- a/pkgs/by-name/ha/harvid/package.nix
+++ b/pkgs/by-name/ha/harvid/package.nix
@@ -28,17 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
     libpng
   ];
 
-  makeFlags = [
-    "DESTDIR=$(out)"
-    "libdir=\"/lib\""
-  ];
-
-  postInstall = ''
-    mkdir -p $out/bin
-    mv $out/usr/local/bin/* $out/bin
-    mv $out/usr/local/share $out/
-    rm -r $out/usr
-  '';
+  makeFlags = [ "PREFIX=$(out)" ];
 
   passthru.updateScript = nix-update-script { };
 

From b45c0d74a23e6008ad89d6235810045fc1dcf289 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Thu, 1 Aug 2024 17:48:07 +0100
Subject: [PATCH 51/60] harvid: inject version

---
 pkgs/by-name/ha/harvid/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ha/harvid/package.nix b/pkgs/by-name/ha/harvid/package.nix
index 514e53cc5a8c..ec6a30d97d01 100644
--- a/pkgs/by-name/ha/harvid/package.nix
+++ b/pkgs/by-name/ha/harvid/package.nix
@@ -28,7 +28,10 @@ stdenv.mkDerivation (finalAttrs: {
     libpng
   ];
 
-  makeFlags = [ "PREFIX=$(out)" ];
+  makeFlags = [
+    "PREFIX=$(out)"
+    "VERSION=v${finalAttrs.version}"
+  ];
 
   passthru.updateScript = nix-update-script { };
 

From 3607d36550f425fbd9c9e0a6aad647ed7299e45f Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 21 Jul 2024 13:43:41 +0100
Subject: [PATCH 52/60] harvid: enable parallel building

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

diff --git a/pkgs/by-name/ha/harvid/package.nix b/pkgs/by-name/ha/harvid/package.nix
index ec6a30d97d01..d0b417515291 100644
--- a/pkgs/by-name/ha/harvid/package.nix
+++ b/pkgs/by-name/ha/harvid/package.nix
@@ -33,6 +33,8 @@ stdenv.mkDerivation (finalAttrs: {
     "VERSION=v${finalAttrs.version}"
   ];
 
+  enableParallelBuilding = true;
+
   passthru.updateScript = nix-update-script { };
 
   meta = {

From 9eb2dbb737084d854b62992cf817277584b7e84d Mon Sep 17 00:00:00 2001
From: Ingo Reitz <9l@9lo.re>
Date: Thu, 1 Aug 2024 23:18:08 +0200
Subject: [PATCH 53/60] vscode: 1.91.1 -> 1.92.0

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

diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix
index a57db1275abc..5838232f4e3a 100644
--- a/pkgs/applications/editors/vscode/vscode.nix
+++ b/pkgs/applications/editors/vscode/vscode.nix
@@ -30,21 +30,21 @@ let
   archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz";
 
   sha256 = {
-    x86_64-linux = "0ighhwwmc8cxdabq2wkzzr21sv6zaj90pnqi2cy8krfwm88w6jc0";
-    x86_64-darwin = "1fbpw0xib9vm47ab028frg789vgmkpwcdxs8m2in7ywrckl6xycy";
-    aarch64-linux = "0n0f518xl1fh17llsd159ldi50z2vihkghfq7plfnbnngpf0swy9";
-    aarch64-darwin = "03v3869yblx03j0c3njlvg7qgdmqrg8jvj9s1iyhqw1xpb2lc41c";
-    armv7l-linux = "12dv0vqqzriqr8ysjjx62hy2b41dky2p0rcr11wznqi259bryckr";
+    x86_64-linux = "1q8krqhwlqj3a76hp830nhz27sqwz9i0klh2q2b3n5l29x9cvd34";
+    x86_64-darwin = "1d0sp42g582ykzdpzmr1wqkc0ivg09l9zxm201fxd6irr6i6lvqz";
+    aarch64-linux = "0z48qlz8b7mvznr4d4vi47mibkffbsmbr2bp712h1z9s4jhx40h4";
+    aarch64-darwin = "01hmcnhpfdckaslz7133692n1haiq4ifbv72vbsdnzsrdxs7wd3m";
+    armv7l-linux = "1ifd7z1mvimckb26l1nzv6qd3vjamfrzm0h655367d93fqz4iph4";
   }.${system} or throwSystem;
 in
   callPackage ./generic.nix rec {
     # Please backport all compatible updates to the stable release.
     # This is important for the extension ecosystem.
-    version = "1.91.1";
+    version = "1.92.0";
     pname = "vscode" + lib.optionalString isInsiders "-insiders";
 
     # This is used for VS Code - Remote SSH test
-    rev = "f1e16e1e6214d7c44d078b1f0607b2388f29d729";
+    rev = "b1c0a14de1414fcdaa400695b4db1c0799bc3124";
 
     executableName = "code" + lib.optionalString isInsiders "-insiders";
     longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";
@@ -68,7 +68,7 @@ in
       src = fetchurl {
         name = "vscode-server-${rev}.tar.gz";
         url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";
-        sha256 = "0k38pkfz9kpbpx0n50iq531mrm7qxqggks092cs4zicv815jk8wg";
+        sha256 = "03skx6cla4k5clncxx8wlp0j40gkqggqcs9wl0dqkrv18cljy5zz";
       };
     };
 

From 9075e930bb3df8ac97a2598ea18a2a767994ff41 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 1 Aug 2024 21:44:52 +0000
Subject: [PATCH 54/60] python312Packages.xdoctest: 1.1.5 -> 1.1.6

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

diff --git a/pkgs/development/python-modules/xdoctest/default.nix b/pkgs/development/python-modules/xdoctest/default.nix
index 686c6e8b765e..7965d1db3efa 100644
--- a/pkgs/development/python-modules/xdoctest/default.nix
+++ b/pkgs/development/python-modules/xdoctest/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "xdoctest";
-  version = "1.1.5";
+  version = "1.1.6";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "Erotemic";
     repo = "xdoctest";
     rev = "refs/tags/v${version}";
-    hash = "sha256-lC4xX5V5iasQdR4tkLEvtMe/OjSp6+A7D2QGX6TFY4E=";
+    hash = "sha256-L/RtD/e0ubW3j4623HQGfowXQYZjl7dDfwwbfxm3ll8=";
   };
 
   nativeBuildInputs = [

From 0793d3ec355fb761a9164b58aba2535117d03436 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 21 Jul 2024 13:43:41 +0100
Subject: [PATCH 55/60] harvid: fix on Darwin

---
 pkgs/by-name/ha/harvid/package.nix | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ha/harvid/package.nix b/pkgs/by-name/ha/harvid/package.nix
index d0b417515291..cdb6e4115b87 100644
--- a/pkgs/by-name/ha/harvid/package.nix
+++ b/pkgs/by-name/ha/harvid/package.nix
@@ -3,6 +3,9 @@
   stdenv,
   fetchFromGitHub,
   pkg-config,
+  which,
+  unixtools,
+  cctools,
   ffmpeg,
   libjpeg,
   libpng,
@@ -20,7 +23,12 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "sha256-p0W+rKHH/iuGOcRjl6b4s6jQYkm7bqWCz849SDI/7fQ=";
   };
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs =
+    [ pkg-config ]
+    ++ lib.optionals stdenv.isDarwin [
+      which
+      unixtools.xxd
+    ];
 
   buildInputs = [
     ffmpeg
@@ -28,6 +36,11 @@ stdenv.mkDerivation (finalAttrs: {
     libpng
   ];
 
+  postPatch = lib.optionalString stdenv.isDarwin ''
+    substituteInPlace libharvid/Makefile \
+      --replace-fail /usr/bin/libtool ${cctools}/bin/libtool
+  '';
+
   makeFlags = [
     "PREFIX=$(out)"
     "VERSION=v${finalAttrs.version}"
@@ -48,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     homepage = "http://x42.github.io/harvid";
     license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.unix;
     maintainers = [ lib.maintainers.mitchmindtree ];
     mainProgram = "harvid";
   };

From 2570854a2a5a1dac7c5f2d1b4316797831c558c8 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Thu, 1 Aug 2024 23:56:41 +0100
Subject: [PATCH 56/60] processing: format with nixfmt

---
 .../graphics/processing/default.nix           | 48 ++++++++++++++++---
 1 file changed, 41 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix
index 9ea148323cde..b7fe0a824f85 100644
--- a/pkgs/applications/graphics/processing/default.nix
+++ b/pkgs/applications/graphics/processing/default.nix
@@ -1,4 +1,20 @@
-{ lib, stdenv, fetchFromGitHub, fetchurl, ant, unzip, makeWrapper, jdk, jogl, rsync, ffmpeg, batik, stripJavaArchivesHook, wrapGAppsHook3, libGL }:
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchurl,
+  ant,
+  unzip,
+  makeWrapper,
+  jdk,
+  jogl,
+  rsync,
+  ffmpeg,
+  batik,
+  stripJavaArchivesHook,
+  wrapGAppsHook3,
+  libGL,
+}:
 let
   buildNumber = "1293";
   vaqua = fetchurl {
@@ -37,9 +53,11 @@ let
     sha256 = "sha256-N4U04znm5tULFzb7Ort28cFdG+P0wTzsbVNkEuI9pgM=";
   };
 
-  arch = {
-    x86_64 = "amd64";
-  }.${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name;
+  arch =
+    {
+      x86_64 = "amd64";
+    }
+    .${stdenv.hostPlatform.parsed.cpu.name} or stdenv.hostPlatform.parsed.cpu.name;
 in
 stdenv.mkDerivation rec {
   pname = "processing";
@@ -52,8 +70,21 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-SzQemZ6iZ9o89/doV8YMv7DmyPSDyckJl3oyxJyfrm0=";
   };
 
-  nativeBuildInputs = [ ant unzip makeWrapper stripJavaArchivesHook wrapGAppsHook3 ];
-  buildInputs = [ jdk jogl ant rsync ffmpeg batik ];
+  nativeBuildInputs = [
+    ant
+    unzip
+    makeWrapper
+    stripJavaArchivesHook
+    wrapGAppsHook3
+  ];
+  buildInputs = [
+    jdk
+    jogl
+    ant
+    rsync
+    ffmpeg
+    batik
+  ];
 
   dontWrapGApps = true;
 
@@ -108,7 +139,10 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Language and IDE for electronic arts";
     homepage = "https://processing.org";
-    license = with licenses; [ gpl2Only lgpl21Only ];
+    license = with licenses; [
+      gpl2Only
+      lgpl21Only
+    ];
     platforms = platforms.linux;
     maintainers = with maintainers; [ evan-goode ];
   };

From 0dbf5b7b90b8af129895b6b9ffef12019fea8ee6 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Fri, 2 Aug 2024 00:27:41 +0100
Subject: [PATCH 57/60] processing: fix build

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

diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix
index b7fe0a824f85..59ab93c1867d 100644
--- a/pkgs/applications/graphics/processing/default.nix
+++ b/pkgs/applications/graphics/processing/default.nix
@@ -105,7 +105,7 @@ stdenv.mkDerivation rec {
     mv app/lib/{jna-5.10.0/dist/jna.jar,}
     mv app/lib/{jna-5.10.0/dist/jna-platform.jar,}
     ln -sf ${batik}/* java/libraries/svg/library/
-    cp java/libraries/svg/library/lib/batik-all-${batik.version}.jar java/libraries/svg/library/batik.jar
+    cp java/libraries/svg/library/share/java/batik-all-${batik.version}.jar java/libraries/svg/library/batik.jar
     echo "tarring ffmpeg"
     tar --checkpoint=10000 -czf build/shared/tools/MovieMaker/ffmpeg-5.0.1.gz ${ffmpeg}
     cd build

From 58c534774a82a62394bf1c401ae70b9f5268d8c8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 2 Aug 2024 04:07:33 +0000
Subject: [PATCH 58/60] python312Packages.plantuml-markdown: 3.9.8 -> 3.10.0

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

diff --git a/pkgs/development/python-modules/plantuml-markdown/default.nix b/pkgs/development/python-modules/plantuml-markdown/default.nix
index cd9872c9fd5f..b7e4c1ec34ca 100644
--- a/pkgs/development/python-modules/plantuml-markdown/default.nix
+++ b/pkgs/development/python-modules/plantuml-markdown/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "plantuml-markdown";
-  version = "3.9.8";
+  version = "3.10.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "mikitex70";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-gBlHWAD8MIymCqtqxKRneScMztFzPStIMIO+IrHpgpc=";
+    hash = "sha256-t5OZ0n2TLQFaGievFWlYTXslP4yCvpQ3MyNQZ3/xYRs=";
   };
 
   propagatedBuildInputs = [

From b2e490a586b0270c2994ce885b9018aa88084b4d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 2 Aug 2024 04:27:47 +0000
Subject: [PATCH 59/60] python312Packages.yolink-api: 0.4.5 -> 0.4.6

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

diff --git a/pkgs/development/python-modules/yolink-api/default.nix b/pkgs/development/python-modules/yolink-api/default.nix
index 97d56150770f..07e9937667f6 100644
--- a/pkgs/development/python-modules/yolink-api/default.nix
+++ b/pkgs/development/python-modules/yolink-api/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "yolink-api";
-  version = "0.4.5";
+  version = "0.4.6";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "YoSmart-Inc";
     repo = "yolink-api";
     rev = "refs/tags/v${version}";
-    hash = "sha256-qavVdIcOaCdODceok5tTobSWpPzuLvbzaFYkOVjD+9A=";
+    hash = "sha256-A5cFz1u2b6mlE4NtMRQU3lruNqNWTYXH+tMvkH/zfUw=";
   };
 
   build-system = [ setuptools ];

From 32c4daf047f25348d80eca559dc054278f3a1493 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 2 Aug 2024 04:29:19 +0000
Subject: [PATCH 60/60] python312Packages.wagtail: 6.1.3 -> 6.2

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

diff --git a/pkgs/development/python-modules/wagtail/default.nix b/pkgs/development/python-modules/wagtail/default.nix
index 6b01ac4147ff..ae55189f99c6 100644
--- a/pkgs/development/python-modules/wagtail/default.nix
+++ b/pkgs/development/python-modules/wagtail/default.nix
@@ -26,14 +26,14 @@
 
 buildPythonPackage rec {
   pname = "wagtail";
-  version = "6.1.3";
+  version = "6.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-j0kIqxtrljqKp6348OxzjNHcebmBbG1fWQGPYApAQ3g=";
+    hash = "sha256-WQhujKGBsQ8nSxE5JFAFBN7W/BaCTBl283w8vd0QDSQ=";
   };
 
   postPatch = ''