From bd87a38b86f889a6902a356ab415eeead881766b Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Fri, 26 Apr 2024 11:59:58 +0000
Subject: [PATCH 01/45] nixos/lemmy: fix nginx backend to proxy needed headers

the nix `recommendedProxySettings` optiononly takes effect if `proxyPass`
is set, but since we manually invoke `proxy_pass` inside nginx we need
to also manually specify proxy settings. failing to do so leads to
symptoms such as "Incoming activity has invalid signature".
see: <https://github.com/LemmyNet/lemmy/issues/3273>
---
 nixos/modules/services/web-apps/lemmy.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/lemmy.nix b/nixos/modules/services/web-apps/lemmy.nix
index 3185f9a4263c..11608418e978 100644
--- a/nixos/modules/services/web-apps/lemmy.nix
+++ b/nixos/modules/services/web-apps/lemmy.nix
@@ -204,7 +204,6 @@ in
           };
           "/" = {
             # mixed frontend and backend requests, based on the request headers
-            recommendedProxySettings = true;
             extraConfig = ''
               set $proxpass "${ui}";
               if ($http_accept = "application/activity+json") {
@@ -221,6 +220,11 @@ in
               rewrite ^(.+)/+$ $1 permanent;
 
               proxy_pass $proxpass;
+              # Proxied `Host` header is required to validate ActivityPub HTTP signatures for incoming events.
+              # The other headers are optional, for the sake of better log data.
+              proxy_set_header X-Real-IP $remote_addr;
+              proxy_set_header Host $host;
+              proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
             '';
           };
         };

From 899a7b2472bc386979824f6e6633f6d723c802a7 Mon Sep 17 00:00:00 2001
From: d4rk <d4rk@blackvoltage.org>
Date: Sun, 3 Nov 2024 15:36:05 -0800
Subject: [PATCH 02/45] maintainers: add d4rk

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6ced83f98095..ffb5eb991945 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4719,6 +4719,12 @@
     github = "d4ilyrun";
     githubId = 34611103;
   };
+  d4rk = {
+    name = "Anoop Menon";
+    email = "d4rk@blackvoltage.org";
+    github = "d4rk";
+    githubId = 22163;
+  };
   d4rkstar = {
     name = "Bruno Salzano";
     email = "d4rkstar@gmail.com";

From f28124f58a6db5068d5e85af5a340e396126384e Mon Sep 17 00:00:00 2001
From: d4rk <d4rk@blackvoltage.org>
Date: Tue, 1 Oct 2024 12:35:01 -0700
Subject: [PATCH 03/45] vulkan-hdr-layer-kwin6: init at 0-unstable-2024-10-19

https://github.com/Zamundaaa/VK_hdr_layer

Enables HDR support for Vulkan clients (such as mpv) on kwin6.

This is likely to be a temporary solution until Wayland upstream
adopts the necessary protocols, however that has been in the works for
many years:

https://gitlab.freedesktop.org/wayland/wayland-protocols/-/merge_requests/14

For the time being, this provides a path for users to experiment with
HDR, share feedback and hopefully make progress.

Arch provides a similar package:
https://aur.archlinux.org/packages/vk-hdr-layer-kwin6-git
---
 .../vu/vulkan-hdr-layer-kwin6/package.nix     | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 pkgs/by-name/vu/vulkan-hdr-layer-kwin6/package.nix

diff --git a/pkgs/by-name/vu/vulkan-hdr-layer-kwin6/package.nix b/pkgs/by-name/vu/vulkan-hdr-layer-kwin6/package.nix
new file mode 100644
index 000000000000..d698760dbf22
--- /dev/null
+++ b/pkgs/by-name/vu/vulkan-hdr-layer-kwin6/package.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  stdenv,
+  cmake,
+  fetchFromGitHub,
+  libX11,
+  meson,
+  ninja,
+  pkg-config,
+  vulkan-headers,
+  vulkan-loader,
+  wayland-scanner,
+  wayland,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "vulkan-hdr-layer-kwin6";
+  version = "0-unstable-2024-10-19";
+
+  depsBuildBuild = [ pkg-config ];
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    cmake
+    wayland-scanner
+  ];
+
+  buildInputs = [
+    vulkan-headers
+    vulkan-loader
+    libX11
+    wayland
+  ];
+
+  strictDeps = true;
+
+  src = fetchFromGitHub {
+    owner = "Zamundaaa";
+    repo = "VK_hdr_layer";
+    rev = "e173f2617262664901039e3c821929afce05d2c1";
+    hash = "sha256-hBxRwbn29zFeHcRpfMF6I4piSASpN2AvZY0ci5Utj4U=";
+    fetchSubmodules = true;
+  };
+
+  meta = {
+    description = "Vulkan Wayland HDR WSI Layer (Xaver Hugl's fork for KWin 6)";
+    homepage = "https://github.com/Zamundaaa/VK_hdr_layer";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ d4rk ];
+  };
+}

From ccfbd723b367889f71eb4569d631ee90349dd650 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 14 Nov 2024 23:19:25 +0000
Subject: [PATCH 04/45] passt: 2024_09_06.6b38f07 -> 2024_10_30.ee7d0b6

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

diff --git a/pkgs/by-name/pa/passt/package.nix b/pkgs/by-name/pa/passt/package.nix
index 6f9c04ae0fb9..ad04ac2b30ed 100644
--- a/pkgs/by-name/pa/passt/package.nix
+++ b/pkgs/by-name/pa/passt/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "passt";
-  version = "2024_09_06.6b38f07";
+  version = "2024_10_30.ee7d0b6";
 
   src = fetchurl {
     url = "https://passt.top/passt/snapshot/passt-${finalAttrs.version}.tar.gz";
-    hash = "sha256-Qf1neJOkYXR5p9Owk60qtc22A+au4EY45Qt9PfJ+Lrs=";
+    hash = "sha256-x5WIqtWBfVt7+u47bfT2g92ghhaIjYt2GW279+sbKdE=";
   };
 
   postPatch = ''

From 33586ab6d6875a83333f8a165878d144475d537b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 Nov 2024 01:19:38 +0000
Subject: [PATCH 05/45] boogie: 3.2.5 -> 3.4.2

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

diff --git a/pkgs/by-name/bo/boogie/package.nix b/pkgs/by-name/bo/boogie/package.nix
index c018581cecf7..83809abfe4c7 100644
--- a/pkgs/by-name/bo/boogie/package.nix
+++ b/pkgs/by-name/bo/boogie/package.nix
@@ -2,13 +2,13 @@
 
 buildDotnetModule rec {
   pname = "Boogie";
-  version = "3.2.5";
+  version = "3.4.2";
 
   src = fetchFromGitHub {
     owner = "boogie-org";
     repo = "boogie";
     rev = "v${version}";
-    hash = "sha256-36aGVJEzaAwQgR11NI+v8c4cXm24iiXtiwjW6qd3qsE=";
+    hash = "sha256-IWtYbb1IFB6DLIYYTP+q7q+h/0aqonxr/mWwf+83aRo=";
   };
 
   projectFile = [ "Source/Boogie.sln" ];

From 82803318055e6dbf94e1d01db373cde0b7292f17 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 15 Nov 2024 03:34:03 +0000
Subject: [PATCH 06/45] renode-unstable: 1.15.3+20241004git4b8a8f170 ->
 1.15.3+20241112git6e850cb52

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

diff --git a/pkgs/by-name/re/renode-unstable/package.nix b/pkgs/by-name/re/renode-unstable/package.nix
index 8426e804c075..95a18ec25f26 100644
--- a/pkgs/by-name/re/renode-unstable/package.nix
+++ b/pkgs/by-name/re/renode-unstable/package.nix
@@ -5,11 +5,11 @@
 
 renode.overrideAttrs (finalAttrs: _: {
   pname = "renode-unstable";
-  version = "1.15.3+20241004git4b8a8f170";
+  version = "1.15.3+20241112git6e850cb52";
 
   src = fetchurl {
     url = "https://builds.renode.io/renode-${finalAttrs.version}.linux-dotnet.tar.gz";
-    hash = "sha256-/+fH5DHL/kg4IlJyOlCuOMsUocaBsA8GYvq5iP7Ip+4=";
+    hash = "sha256-GkmzPc0pPRglkuGzPU+rLUcwlhw8v4VgQnxnkzT/+cI=";
   };
 
   passthru.updateScript =

From aef4e7d0bdad3e1ac2b02b8a68598572f7bb651a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Nov 2024 00:47:57 +0000
Subject: [PATCH 07/45] glooctl: 1.17.14 -> 1.17.16

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

diff --git a/pkgs/by-name/gl/glooctl/package.nix b/pkgs/by-name/gl/glooctl/package.nix
index 8121f7005f3c..c66ebfa74be6 100644
--- a/pkgs/by-name/gl/glooctl/package.nix
+++ b/pkgs/by-name/gl/glooctl/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "glooctl";
-  version = "1.17.14";
+  version = "1.17.16";
 
   src = fetchFromGitHub {
     owner = "solo-io";
     repo = "gloo";
     rev = "v${version}";
-    hash = "sha256-7KkaQYTsamUapWKPB0JIoEnOs/SvrCbBgQqvQg9VQ9o=";
+    hash = "sha256-GU6Vdnb4eQnpv9DwpLJvwUONwmEG9mOORojBsJZNATw=";
   };
 
-  vendorHash = "sha256-rAObw4J0ATle1gq5Z1MsrGy/iqQDHjnMPAEIPBgtY3g=";
+  vendorHash = "sha256-NXQTDiUBQEr/QzpDV8b13nGUJ3YmkZNYBrlT4tiRalk=";
 
   subPackages = [ "projects/gloo/cli/cmd" ];
 

From 9f1665e1f823d7a49182a4eb85beb873ee0e838f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 16 Nov 2024 16:21:04 +0000
Subject: [PATCH 08/45] jbang: 0.119.0 -> 0.120.4

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

diff --git a/pkgs/by-name/jb/jbang/package.nix b/pkgs/by-name/jb/jbang/package.nix
index 085612b67a34..7015dc0b66db 100644
--- a/pkgs/by-name/jb/jbang/package.nix
+++ b/pkgs/by-name/jb/jbang/package.nix
@@ -1,12 +1,12 @@
 { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }:
 
 stdenv.mkDerivation rec {
-  version = "0.119.0";
+  version = "0.120.4";
   pname = "jbang";
 
   src = fetchzip {
     url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar";
-    sha256 = "sha256-ebwBRzgpYEomboY+hMok8KmOaNR4hRaPy7SxjHbLeYU=";
+    sha256 = "sha256-JjAHvXf4BKGgWGstDJmC8c8BoveZIha/g9b/d8LdXHU=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From b69e16a70ecfd78ce929e1f1b55e61f2451bc6a4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 30 Nov 2024 19:20:32 +0000
Subject: [PATCH 09/45] python312Packages.gsd: 3.4.0 -> 3.4.2

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

diff --git a/pkgs/development/python-modules/gsd/default.nix b/pkgs/development/python-modules/gsd/default.nix
index 28c9a5aa3d25..88d51e88c33e 100644
--- a/pkgs/development/python-modules/gsd/default.nix
+++ b/pkgs/development/python-modules/gsd/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "gsd";
-  version = "3.4.0";
+  version = "3.4.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "glotzerlab";
     repo = "gsd";
     rev = "refs/tags/v${version}";
-    hash = "sha256-4HJZZ5UUENHhKePfau6KT4E4qA9YCGpe/IMLyf5egsk=";
+    hash = "sha256-sBO5tt85BVLUrqSVWUT/tYzeLWyvyyI9ZXjNLt9/uAE=";
   };
 
   build-system = [

From 07e283f2b1e4b137be13af7fd38ad5c357a3f716 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Christ?= <dev@ntr.li>
Date: Wed, 4 Dec 2024 11:06:49 +0100
Subject: [PATCH 10/45] modules/avahi: Enable IPv6 by default

Avahi's default for `use-ipv6` is yes as well. I see no reason why we
should do this differently.
---
 nixos/doc/manual/release-notes/rl-2505.section.md  | 2 ++
 nixos/modules/services/networking/avahi-daemon.nix | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index 39849d5d64c2..2d6c8a87b839 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -77,6 +77,8 @@
 
 - Cinnamon has been updated to 6.4.
 
+- `services.avahi.ipv6` now defaults to true.
+
 - `bind.cacheNetworks` now only controls access for recursive queries, where it previously controlled access for all queries.
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix
index 73fc210728d8..47b707f213f0 100644
--- a/nixos/modules/services/networking/avahi-daemon.nix
+++ b/nixos/modules/services/networking/avahi-daemon.nix
@@ -91,7 +91,7 @@ in
 
     ipv6 = lib.mkOption {
       type = lib.types.bool;
-      default = false;
+      default = true;
       description = "Whether to use IPv6.";
     };
 

From 77a0bdd5afe11aec9c96c9c0f094bd70927634c8 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Wed, 4 Dec 2024 19:19:50 -0700
Subject: [PATCH 11/45] scrcpy: 3.0 -> 3.0.2

https://github.com/Genymobile/scrcpy/releases/tag/v3.0.2
---
 pkgs/by-name/sc/scrcpy/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sc/scrcpy/package.nix b/pkgs/by-name/sc/scrcpy/package.nix
index d02b5a903286..afe4147f1930 100644
--- a/pkgs/by-name/sc/scrcpy/package.nix
+++ b/pkgs/by-name/sc/scrcpy/package.nix
@@ -16,12 +16,12 @@
 }:
 
 let
-  version = "3.0";
+  version = "3.0.2";
   prebuilt_server = fetchurl {
     name = "scrcpy-server";
     inherit version;
     url = "https://github.com/Genymobile/scrcpy/releases/download/v${version}/scrcpy-server-v${version}";
-    hash = "sha256-gABExiqU1fwW9auchtRbEFDq4+tDZRTRsNL+Jka4lOo=";
+    hash = "sha256-4Z/gJL+jNngJSUQHrWyoCab2532slemfhbp1FE4Lo10=";
   };
 in
 stdenv.mkDerivation rec {
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     owner = "Genymobile";
     repo = "scrcpy";
     rev = "refs/tags/v${version}";
-    hash = "sha256-fKfiBx3uQH30ZLCWRY33KyisjxLDvWJCdKbGn4j0dWw=";
+    hash = "sha256-6CViFgQuazvKGPHGpityEI/mpgOmIBA6LTEHobWybV0=";
   };
 
   #   display.c: When run without a hardware accelerator, this allows the command to continue working rather than failing unexpectedly.

From 4cce7a0518b81d124b9b09cd082033b14114e783 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 5 Dec 2024 12:59:00 +0000
Subject: [PATCH 12/45] dosbox-x: 2024.10.01 -> 2024.12.04

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

diff --git a/pkgs/applications/emulators/dosbox-x/default.nix b/pkgs/applications/emulators/dosbox-x/default.nix
index dc12dc2da62e..a7cc9b5ea6a3 100644
--- a/pkgs/applications/emulators/dosbox-x/default.nix
+++ b/pkgs/applications/emulators/dosbox-x/default.nix
@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dosbox-x";
-  version = "2024.10.01";
+  version = "2024.12.04";
 
   src = fetchFromGitHub {
     owner = "joncampbell123";
     repo = "dosbox-x";
     rev = "dosbox-x-v${finalAttrs.version}";
-    hash = "sha256-qfrEy7OndhJ/UnfFDCp7qlIhYWANkUBy2ejYVvRrG3k=";
+    hash = "sha256-wZCLwEInUfzuOCcUsz8W+Gi00lp4Nwc0QZjLF8/e9iM=";
   };
 
   # sips is unavailable in sandbox, replacing with imagemagick breaks build due to wrong Foundation propagation(?) so don't generate resolution variants

From d8840638d26b699b42aa13f28cf2ec550f345feb Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 5 Dec 2024 23:14:38 +0100
Subject: [PATCH 13/45] mir: 2.18.3 -> 2.19.2

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

diff --git a/pkgs/servers/mir/default.nix b/pkgs/servers/mir/default.nix
index 12e3019d5225..8fcc689ddd66 100644
--- a/pkgs/servers/mir/default.nix
+++ b/pkgs/servers/mir/default.nix
@@ -5,8 +5,8 @@ let
 in
 {
   mir = common {
-    version = "2.18.3";
-    hash = "sha256-2PwLTWQeaVR80slZ6/BPr23gVahiDWXulFtdjc9ZUCs=";
+    version = "2.19.2";
+    hash = "sha256-E6+FjYJUIgejpat1Kyl0B1JL+mnQd4rXjSQAPTX31qc=";
   };
 
   mir_2_15 = common {

From db2b768ef87dc4bac78b49b552b7982e49b17a45 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 5 Dec 2024 23:15:08 +0100
Subject: [PATCH 14/45] miracle-wm: Fix compat with mir 2.19

---
 pkgs/by-name/mi/miracle-wm/package.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/mi/miracle-wm/package.nix b/pkgs/by-name/mi/miracle-wm/package.nix
index 5b2e897ae7e3..bbe9444f0489 100644
--- a/pkgs/by-name/mi/miracle-wm/package.nix
+++ b/pkgs/by-name/mi/miracle-wm/package.nix
@@ -30,18 +30,25 @@ stdenv.mkDerivation (finalAttrs: {
   version = "0.3.7";
 
   src = fetchFromGitHub {
-    owner = "mattkae";
+    owner = "miracle-wm-org";
     repo = "miracle-wm";
     rev = "v${finalAttrs.version}";
     hash = "sha256-31S7Mfz3LIOAmDUl6jbr3kSP2BdLaM0M4xMZ8FHhLH0=";
   };
 
   patches = [
-    # Remove when https://github.com/mattkae/miracle-wm/pull/211 merged & in release
+    # Remove when version > 0.3.7
     (fetchpatch {
-      name = "0001-miracle-wm-Dont-ignore-PKG_CONFIG_PATH.patch";
-      url = "https://github.com/mattkae/miracle-wm/commit/a9fe6ed1e7dc605f72e18cdc2d19afb3c187be3a.patch";
-      hash = "sha256-zzOwqUjyZGYIy/3BvOiedfCubrqaeglvsAzTXyq3wYU=";
+      name = "0001-miracle-wm-Dont-override-PKG_CONFIG_PATH.patch";
+      url = "https://github.com/miracle-wm-org/miracle-wm/commit/0a8809d4362e1d3abbea6e29fd1234c8fa981bfb.patch";
+      hash = "sha256-Fy/fDmV1uXRt4omxccpFkZb0vE8iHYSS9A7E+PEFBOM=";
+    })
+
+    # Remove when version > 0.3.7
+    (fetchpatch {
+      name = "0002-miracle-wm-Fix-mir-2.19-support.patch";
+      url = "https://github.com/miracle-wm-org/miracle-wm/commit/a9db8b539a5396e9df6f6f009cbabcbb053f2b05.patch";
+      hash = "sha256-VxUVpwBSHuLzs0yEQ7gStpMnHRJJtZ/Shmjb2un3qI0=";
     })
   ];
 

From b14e7f5fc29be74157917db7af3a7de64213f0bc Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 5 Dec 2024 23:15:37 +0100
Subject: [PATCH 15/45] miriway: 24.10.1 -> 24.11.1

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

diff --git a/pkgs/by-name/mi/miriway/package.nix b/pkgs/by-name/mi/miriway/package.nix
index fe41c1b313b2..830b8c28d7e2 100644
--- a/pkgs/by-name/mi/miriway/package.nix
+++ b/pkgs/by-name/mi/miriway/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "miriway";
-  version = "24.10.1";
+  version = "24.11.1";
 
   src = fetchFromGitHub {
     owner = "Miriway";
     repo = "Miriway";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-jpXsvr2HnfMCJh851oS+IiQLSmL9C1bnaG6IPSq5xrA=";
+    hash = "sha256-DphzqU0jT2NE2dSDuQf6BQIjXTwJuPiOjfxk9N9YmaQ=";
   };
 
   postPatch = ''

From c769b4d2fb9cef6475a42a98d9aa6b3900321401 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Dec 2024 11:24:01 +0000
Subject: [PATCH 16/45] weaver: 0.10.0 -> 0.11.0

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

diff --git a/pkgs/by-name/we/weaver/package.nix b/pkgs/by-name/we/weaver/package.nix
index 7734b0d6f585..d50644d1c215 100644
--- a/pkgs/by-name/we/weaver/package.nix
+++ b/pkgs/by-name/we/weaver/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "weaver";
-  version = "0.10.0";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "open-telemetry";
     repo = "weaver";
     rev = "v${version}";
-    hash = "sha256-hSoMt+4D1bpENBD9NmuVBLDUOJkau5Sk2OHS5RyDRYQ=";
+    hash = "sha256-xb6u9+cZ7p3b2S+I/mQtBfc7XsVlbeLSMHY3fhS+8/8=";
   };
 
-  cargoHash = "sha256-4rHDulSsFvKly5M5bo1AtEAl280N/hxhznTngCxw36Y=";
+  cargoHash = "sha256-+Swg1ROVO2lVctF7j6Nibx+WPpE2KAdZSeowinXjnmo=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin (
     with darwin.apple_sdk_11_0.frameworks; [ SystemConfiguration ]

From 2f66cc6748b51bd22c7758157b36f1c2ab6f7693 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Dec 2024 12:57:59 +0000
Subject: [PATCH 17/45] abcmidi: 2024.10.10 -> 2024.12.06

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

diff --git a/pkgs/by-name/ab/abcmidi/package.nix b/pkgs/by-name/ab/abcmidi/package.nix
index 5ee24ad3af0b..c1cf87173637 100644
--- a/pkgs/by-name/ab/abcmidi/package.nix
+++ b/pkgs/by-name/ab/abcmidi/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "abcmidi";
-  version = "2024.10.10";
+  version = "2024.12.06";
 
   src = fetchFromGitHub {
     owner = "sshlien";
     repo = "abcmidi";
     rev = "refs/tags/${finalAttrs.version}";
-    hash = "sha256-dAxr1RJrYppt/Gw6ZF3fL0lDhwJNG5v75M6VA1okrtw=";
+    hash = "sha256-uSmkRoAy2tCvSy/jE0wxg2nhiQRF62zCwnr41YpRkXE=";
   };
 
   meta = {

From b5c0139ca0dba9c5d0a3e3b6e7ad96175d67d7df Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Dec 2024 16:05:53 +0000
Subject: [PATCH 18/45] python312Packages.snowflake-connector-python: 3.12.3 ->
 3.12.4

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

diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix
index f20779b9b6d4..f913ee43a2ff 100644
--- a/pkgs/development/python-modules/snowflake-connector-python/default.nix
+++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix
@@ -30,7 +30,7 @@
 
 buildPythonPackage rec {
   pname = "snowflake-connector-python";
-  version = "3.12.3";
+  version = "3.12.4";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     owner = "snowflakedb";
     repo = "snowflake-connector-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Rv4/zGoSBA3Pdu67d96sgZLgZae6yfpLsJzwsm2A690=";
+    hash = "sha256-6poMWKQB/NR40W39KDJwBgYGeAHsr4f1GJhPxYiTc1k=";
   };
 
   build-system = [

From cb51162e00dbc318e2c547f07df6dafc94bbf4dc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 6 Dec 2024 17:26:36 +0000
Subject: [PATCH 19/45] pytr: 0.3.0 -> 0.3.1

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

diff --git a/pkgs/by-name/py/pytr/package.nix b/pkgs/by-name/py/pytr/package.nix
index 6c1e92a9419a..e4fbe4052e67 100644
--- a/pkgs/by-name/py/pytr/package.nix
+++ b/pkgs/by-name/py/pytr/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "pytr";
-  version = "0.3.0";
+  version = "0.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pytr-org";
     repo = "pytr";
     rev = "refs/tags/v${version}";
-    hash = "sha256-sMDWL0lA5iJ2v2dhUIhMgSZ1vk7LjkNMYZGiJRpd3XY=";
+    hash = "sha256-OFONjJXKkfb6+bQx5fhsadjm9WG62FISznnWL9IEY7I=";
   };
 
   build-system = with python3Packages; [

From 674835a9d98fd037c8f6ce1c954b5e07e56b0832 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Fri, 6 Dec 2024 20:24:46 +0100
Subject: [PATCH 20/45] chromium: remove ofborg maintainer ping workaround, use
 CODEOWNERS

The workaround to have ofborg ping chromium and ungoogled-chromium
maintainers when a change was only made to the upstream-info relied on
string context.

That string context was provided by the upstream-info being a nix file,
not a json file, and then holding on to that string context using
awkward attribute merges.

It was intended as a quick fix until the handling of this would improve
in ofborg itself and worked great.

That was until very recently when we switched from the chromium release
tarball to git source fetching in 8dd2f1add978a4747a5962f2874b8ad20f86b01c.

Part of that change included going back from upstream-info.nix to
upstream-info.json and with that losing the string context and the base
on which this workaround used to work.

But this is fine. A lot has happened in the meantime.

CODEOWNERS was reimplemented and no longer requires every user listed in
it to have write permissions to the repository (commit bit).

Meaning we can accept that ofborg pings no longer work and instead rely
on CODEOWNERS exclusively.

It should, however, be noted that CODEOWNERS provide less granularity
than ofborg, meaning we can no longer differentiate between
ungoogled-chromium and chromium or even chromedriver.

Previously, implementing the workaround that is now essentially
reverted: 68c59791fb6644ac733d99d0147b09bce4cb8319
---
 ci/OWNERS                                                  | 4 ++--
 pkgs/applications/networking/browsers/chromium/browser.nix | 2 ++
 pkgs/applications/networking/browsers/chromium/common.nix  | 7 +------
 pkgs/applications/networking/browsers/chromium/default.nix | 6 ------
 4 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/ci/OWNERS b/ci/OWNERS
index b8699826ebd7..2ffee66285cf 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -207,8 +207,8 @@ nixos/modules/installer/tools/nix-fallback-paths.nix  @NixOS/nix-team @raitobeza
 
 # Browsers
 /pkgs/applications/networking/browsers/firefox @mweinelt
-/pkgs/applications/networking/browsers/chromium @emilylange
-/nixos/tests/chromium.nix @emilylange
+/pkgs/applications/networking/browsers/chromium @emilylange @networkException
+/nixos/tests/chromium.nix @emilylange @networkException
 
 # Certificate Authorities
 pkgs/data/misc/cacert/ @ajs124 @lukegb @mweinelt
diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix
index d4259c2895ad..bdedac20c5eb 100644
--- a/pkgs/applications/networking/browsers/chromium/browser.nix
+++ b/pkgs/applications/networking/browsers/chromium/browser.nix
@@ -84,6 +84,8 @@ mkChromiumDerivation (base: rec {
     homepage = if ungoogled
       then "https://github.com/ungoogled-software/ungoogled-chromium"
       else "https://www.chromium.org/";
+    # Maintainer pings for this derivation are highly unreliable.
+    # If you add yourself as maintainer here, please also add yourself as CODEOWNER.
     maintainers = with lib.maintainers; if ungoogled
       then [ networkexception emilylange ]
       else [ networkexception emilylange ];
diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index 4a16de319a1e..c0a661a86038 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -663,12 +663,7 @@ let
     } // lib.optionalAttrs (!isElectron) {
       inherit chromiumDeps npmDeps;
     };
-  }
-  # overwrite `version` with the exact same `version` from the same source,
-  # except it internally points to `upstream-info.nix` for
-  # `builtins.unsafeGetAttrPos`, which is used by ofborg to decide
-  # which maintainers need to be pinged.
-  // builtins.removeAttrs upstream-info (builtins.filter (e: e != "version") (builtins.attrNames upstream-info));
+  };
 
 # Remove some extraAttrs we supplied to the base attributes already.
 in stdenv.mkDerivation (base // removeAttrs extraAttrs [
diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index 4f0255210d31..296c35021280 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -178,9 +178,3 @@ in stdenv.mkDerivation {
     inherit sandboxExecutableName;
   };
 }
-# the following is a complicated and long-winded variant of
-# `inherit (chromium.browser) version`, with the added benefit
-# that it keeps the pointer to upstream-info.nix for
-# builtins.unsafeGetAttrPos, which is what ofborg uses to
-# decide which maintainers need to be pinged.
-// builtins.removeAttrs chromium.browser (builtins.filter (e: e != "version") (builtins.attrNames chromium.browser))

From 9bde82f503b18120f1b04c1b76076ab23abd45c1 Mon Sep 17 00:00:00 2001
From: Caleb Maclennan <caleb@alerque.com>
Date: Fri, 6 Dec 2024 23:54:58 +0300
Subject: [PATCH 21/45] decasify: drop obsolete workaround for
 fetchCargoTarball triggering configure

---
 pkgs/by-name/de/decasify/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/de/decasify/package.nix b/pkgs/by-name/de/decasify/package.nix
index ce832d4d10d9..c45c48185103 100644
--- a/pkgs/by-name/de/decasify/package.nix
+++ b/pkgs/by-name/de/decasify/package.nix
@@ -24,8 +24,6 @@ stdenv.mkDerivation (finalAttrs: {
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit (finalAttrs) pname version src;
     nativeBuildInputs = [ zstd ];
-    # so the cargo fetcher won't try to run the `./configure` script
-    dontConfigure = true;
     hash = "sha256-bD8MYufI87j//7dIAnCzmp4yoOaT81Zv1i7rjWpjPlc=";
   };
 

From 5017d412385266a90430d3a07853dedb0dd5f664 Mon Sep 17 00:00:00 2001
From: Caleb Maclennan <caleb@alerque.com>
Date: Fri, 6 Dec 2024 23:56:31 +0300
Subject: [PATCH 22/45] git-warp-time: drop obsolete workaround for
 fetchCargoTarball triggering configure

---
 pkgs/by-name/gi/git-warp-time/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/gi/git-warp-time/package.nix b/pkgs/by-name/gi/git-warp-time/package.nix
index 332b462d9e8d..ff50317d8ec8 100644
--- a/pkgs/by-name/gi/git-warp-time/package.nix
+++ b/pkgs/by-name/gi/git-warp-time/package.nix
@@ -27,8 +27,6 @@ stdenv.mkDerivation (finalAttrs: {
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit (finalAttrs) pname version src;
     nativeBuildInputs = [ zstd ];
-    # so the cargo fetcher won't try to run the `./configure` script
-    dontConfigure = true;
     hash = "sha256-bmClqtH1xU2KOKVbCOrgN14jpLKiA2ZMzWwrOiufwnQ=";
   };
 

From 5edc28dbabaae835c1ad7e3c97984c44e8d9828a Mon Sep 17 00:00:00 2001
From: Caleb Maclennan <caleb@alerque.com>
Date: Fri, 6 Dec 2024 23:56:43 +0300
Subject: [PATCH 23/45] sile: drop obsolete workaround for fetchCargoTarball
 triggering configure

---
 pkgs/by-name/si/sile/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/si/sile/package.nix b/pkgs/by-name/si/sile/package.nix
index dd3c31e2ac92..e3fb2bd1e7f7 100644
--- a/pkgs/by-name/si/sile/package.nix
+++ b/pkgs/by-name/si/sile/package.nix
@@ -39,8 +39,6 @@ stdenv.mkDerivation (finalAttrs: {
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit (finalAttrs) pname version src;
     nativeBuildInputs = [ zstd ];
-    # so the cargo fetcher won't try to run the `./configure` script
-    dontConfigure = true;
     hash = "sha256-iPkXEUC4U1m/ComIDo/J5kwkmM1QdowioNtnSnmMhJ0=";
   };
 

From 5d029a72b3ac5f013580075ce33027224c406516 Mon Sep 17 00:00:00 2001
From: Caleb Maclennan <caleb@alerque.com>
Date: Sat, 7 Dec 2024 00:00:13 +0300
Subject: [PATCH 24/45] sile: mark broken on darwin

Known issue on upstream since v0.15.6, see:
https://github.com/sile-typesetter/sile/issues/2189
---
 pkgs/by-name/si/sile/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/si/sile/package.nix b/pkgs/by-name/si/sile/package.nix
index e3fb2bd1e7f7..8fb9f4e89e0b 100644
--- a/pkgs/by-name/si/sile/package.nix
+++ b/pkgs/by-name/si/sile/package.nix
@@ -167,6 +167,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
+    broken = stdenv.isDarwin;
     description = "Typesetting system";
     longDescription = ''
       SILE is a typesetting system; its job is to produce beautiful

From f1426205cee60dc3f98da50eac5dbf4411ace3a4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 7 Dec 2024 00:15:59 +0100
Subject: [PATCH 25/45] python312Packages.hass-nabucasa: 0.83.0 -> 0.86.0

Diff: https://github.com/nabucasa/hass-nabucasa/compare/refs/tags/0.83.0...0.86.0

Changelog: https://github.com/NabuCasa/hass-nabucasa/releases/tag/0.86.0
---
 pkgs/development/python-modules/hass-nabucasa/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix
index bfe31c016bc3..cda1aa486143 100644
--- a/pkgs/development/python-modules/hass-nabucasa/default.nix
+++ b/pkgs/development/python-modules/hass-nabucasa/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "hass-nabucasa";
-  version = "0.83.0";
+  version = "0.86.0";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     owner = "nabucasa";
     repo = "hass-nabucasa";
     rev = "refs/tags/${version}";
-    hash = "sha256-1l0nLSY+r5ujYo3pHzicqnmZ49OH8elVLGpK3lqCaTo=";
+    hash = "sha256-ySo0G/Zh+KQMocMxrvUua704gt2tWQMlArqxBS/C9hs=";
   };
 
   pythonRelaxDeps = [ "acme" ];

From 2943e975f3c2971f623e52662f807809e08e07cf Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 7 Dec 2024 00:17:45 +0100
Subject: [PATCH 26/45] python312Packages.aioesphomeapi: 27.0.1 -> 28.0.0

Diff: https://github.com/esphome/aioesphomeapi/compare/refs/tags/v27.0.1...v28.0.0

Changelog: https://github.com/esphome/aioesphomeapi/releases/tag/v28.0.0
---
 pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix
index 461fe2c4ff43..c682fde87681 100644
--- a/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/pkgs/development/python-modules/aioesphomeapi/default.nix
@@ -26,7 +26,7 @@
 
 buildPythonPackage rec {
   pname = "aioesphomeapi";
-  version = "27.0.1";
+  version = "28.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -35,7 +35,7 @@ buildPythonPackage rec {
     owner = "esphome";
     repo = "aioesphomeapi";
     rev = "refs/tags/v${version}";
-    hash = "sha256-bcwChHWH621UoGHkP+xPNzmj+Uh18rWgkMSrtW9zFF8=";
+    hash = "sha256-vMqDxg2BV9/g5FquejnT/Rsvwjhdh01K2LxiT355p1U=";
   };
 
   build-system = [

From cc6febd78974a2ffd90c1258b892ac8030bae12f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 7 Dec 2024 00:22:31 +0100
Subject: [PATCH 27/45] python312Packages.aioopenexchangerates: 0.6.17 ->
 0.6.18

Diff: https://github.com/MartinHjelmare/aioopenexchangerates/compare/refs/tags/v0.6.17...v0.6.18

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

diff --git a/pkgs/development/python-modules/aioopenexchangerates/default.nix b/pkgs/development/python-modules/aioopenexchangerates/default.nix
index 02740ccaae7a..42d9511e216e 100644
--- a/pkgs/development/python-modules/aioopenexchangerates/default.nix
+++ b/pkgs/development/python-modules/aioopenexchangerates/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "aioopenexchangerates";
-  version = "0.6.17";
+  version = "0.6.18";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "MartinHjelmare";
     repo = "aioopenexchangerates";
     rev = "refs/tags/v${version}";
-    hash = "sha256-TxYmj5OS9x50QxAOwsFMbM15bhrHTmBTEsRlFoG3Kyc=";
+    hash = "sha256-/iSL+Beny7q9RtdbVIfiMmAwH5wS90ADQszBL7Ooq3o=";
   };
 
   pythonRelaxDeps = [ "pydantic" ];

From 291591157d1e42092b8eed4bcec0e2b76d7e233e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 7 Dec 2024 00:23:06 +0100
Subject: [PATCH 28/45] python312Packages.aiortm: 0.9.38 -> 0.9.42

Diff: https://github.com/MartinHjelmare/aiortm/compare/refs/tags/v0.9.38...v0.9.42

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

diff --git a/pkgs/development/python-modules/aiortm/default.nix b/pkgs/development/python-modules/aiortm/default.nix
index d53f571a0011..b1db4644a133 100644
--- a/pkgs/development/python-modules/aiortm/default.nix
+++ b/pkgs/development/python-modules/aiortm/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "aiortm";
-  version = "0.9.38";
+  version = "0.9.42";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "MartinHjelmare";
     repo = "aiortm";
     rev = "refs/tags/v${version}";
-    hash = "sha256-Qc972Pl+XdgWukgEpTBhsidPvbcPPPWOkqQk24x2ugo=";
+    hash = "sha256-4UN96ZpXssCsYh/UmCaPud+bqgw9ckqofyifvIohBBk=";
   };
 
   pythonRelaxDeps = [ "typer" ];

From 2d3107bd028f9b730f422b0506f57c4a8482a11b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 7 Dec 2024 00:24:33 +0100
Subject: [PATCH 29/45] python312Packages.asyncmy: 0.2.9 -> 0.2.10

Diff: https://github.com/long2ice/asyncmy/compare/refs/tags/v0.2.9...v0.2.10
---
 pkgs/development/python-modules/asyncmy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/asyncmy/default.nix b/pkgs/development/python-modules/asyncmy/default.nix
index 54c5ad8fd37b..33c501910019 100644
--- a/pkgs/development/python-modules/asyncmy/default.nix
+++ b/pkgs/development/python-modules/asyncmy/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "asyncmy";
-  version = "0.2.9";
+  version = "0.2.10";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "long2ice";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-BjjC8pvvQfnvaExhei+F4a2eryHiRbI527BZFLpJk2w=";
+    hash = "sha256-HQZmt22yPYaWfJzL20+jBc855HR4dVW983Z0LrN1Xa0=";
   };
 
   nativeBuildInputs = [

From 0d02317114092677683463029686bb6e9515d4a0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 7 Dec 2024 00:25:08 +0100
Subject: [PATCH 30/45] python312Packages.autoslot: 2022.12.1 -> 2024.12.1

Diff: https://github.com/cjrh/autoslot/compare/refs/tags/v2022.12.1...v2024.12.1
---
 pkgs/development/python-modules/autoslot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/autoslot/default.nix b/pkgs/development/python-modules/autoslot/default.nix
index 55059da486a0..0df019c1c46d 100644
--- a/pkgs/development/python-modules/autoslot/default.nix
+++ b/pkgs/development/python-modules/autoslot/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "autoslot";
-  version = "2022.12.1";
+  version = "2024.12.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "cjrh";
     repo = "autoslot";
     rev = "refs/tags/v${version}";
-    hash = "sha256-fG4rRwRubJt2aXChEsMybEKal6LscZI7GA2uwtK5Vtg=";
+    hash = "sha256-wYjsBrjvSZFHDt0HLrnS9Xwk8EHVQupfPSkQnUFmMAk=";
   };
 
   postPatch = ''

From 612abc0c6783081fa97050ca3835a80037d434ad Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 7 Dec 2024 00:27:05 +0100
Subject: [PATCH 31/45] python312Packages.autoslot: refactor

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

diff --git a/pkgs/development/python-modules/autoslot/default.nix b/pkgs/development/python-modules/autoslot/default.nix
index 0df019c1c46d..84c504bed8ca 100644
--- a/pkgs/development/python-modules/autoslot/default.nix
+++ b/pkgs/development/python-modules/autoslot/default.nix
@@ -10,7 +10,7 @@
 buildPythonPackage rec {
   pname = "autoslot";
   version = "2024.12.1";
-  format = "pyproject";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -21,13 +21,7 @@ buildPythonPackage rec {
     hash = "sha256-wYjsBrjvSZFHDt0HLrnS9Xwk8EHVQupfPSkQnUFmMAk=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace 'requires = ["flit"]' 'requires = ["flit_core"]' \
-      --replace 'build-backend = "flit.buildapi"' 'build-backend = "flit_core.buildapi"'
-  '';
-
-  nativeBuildInputs = [ flit-core ];
+  build-system = [ flit-core ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 

From cc2454d93246a037671e3d744d0de2389335ce25 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 7 Dec 2024 00:29:13 +0100
Subject: [PATCH 32/45] python312Packages.fastcore: 1.7.22 -> 1.7.23

Diff: https://github.com/fastai/fastcore/compare/refs/tags/1.7.22...1.7.23

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

diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix
index 3adf0ad601ae..d65c75556af4 100644
--- a/pkgs/development/python-modules/fastcore/default.nix
+++ b/pkgs/development/python-modules/fastcore/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "fastcore";
-  version = "1.7.22";
+  version = "1.7.23";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "fastai";
     repo = "fastcore";
     rev = "refs/tags/${version}";
-    hash = "sha256-llD7hDZStgCUfp06byGLtLPgDqiK7BAMw9kLNzOGUec=";
+    hash = "sha256-YsZBPcGWKxE5Cl3HCmB2ZDecFuQa5Q5aTEbZ5ijmB24=";
   };
 
   build-system = [ setuptools ];

From de0efdf77900f1eb3aaaad840067f10465d0d1ab Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 7 Dec 2024 00:32:27 +0100
Subject: [PATCH 33/45] python312Packages.openrgb-python: 0.3.2 -> 0.3.3

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

diff --git a/pkgs/development/python-modules/openrgb-python/default.nix b/pkgs/development/python-modules/openrgb-python/default.nix
index 48ac9a55aedc..da2282506af1 100644
--- a/pkgs/development/python-modules/openrgb-python/default.nix
+++ b/pkgs/development/python-modules/openrgb-python/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "openrgb-python";
-  version = "0.3.2";
+  version = "0.3.3";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-euWcot6OfGOSzueA3B4L3h+G2Gv97ZZUiSTABQh8kSc=";
+    hash = "sha256-XQnxYfs7VouABBNBg7mXT3XGfbEP3PNZzVO8TlTpSUc=";
   };
 
   build-system = [ setuptools ];

From b0fed75a832881dbb280306e818685fb94f693b1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 7 Dec 2024 00:33:06 +0100
Subject: [PATCH 34/45] python312Packages.pontos: 24.9.0 -> 24.12.0

Diff: https://github.com/greenbone/pontos/compare/refs/tags/v24.9.0...v24.12.0

Changelog: https://github.com/greenbone/pontos/releases/tag/v24.12.0
---
 pkgs/development/python-modules/pontos/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix
index aeae266c62b0..677b7f7a3c71 100644
--- a/pkgs/development/python-modules/pontos/default.nix
+++ b/pkgs/development/python-modules/pontos/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "pontos";
-  version = "24.9.0";
+  version = "24.12.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "greenbone";
     repo = "pontos";
     rev = "refs/tags/v${version}";
-    hash = "sha256-CgO88I2M8RGpYyJchXZtqxIBjNaULSqnDgfFCUQDFUw=";
+    hash = "sha256-+zlc23NRTDtPRaRnnvlf0tb3kkk+0TYPxACBUR/JWvw=";
   };
 
   build-system = [ poetry-core ];

From d1caef8c5b77511547065c8debcae056f68ad637 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 7 Dec 2024 00:36:06 +0100
Subject: [PATCH 35/45] python312Packages.id: 1.4.0 -> 1.5.0

Diff: di/id@refs/tags/v1.4.0...v1.5.0

Changelog: https://github.com/di/id/blob/1.5.0/CHANGELOG.md
---
 pkgs/development/python-modules/id/default.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/id/default.nix b/pkgs/development/python-modules/id/default.nix
index 7ca8930f4fc4..85e9742c98db 100644
--- a/pkgs/development/python-modules/id/default.nix
+++ b/pkgs/development/python-modules/id/default.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   flit-core,
   pretend,
-  pydantic,
   pytestCheckHook,
   pythonOlder,
   requests,
@@ -12,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "id";
-  version = "1.4.0";
+  version = "1.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -21,15 +20,12 @@ buildPythonPackage rec {
     owner = "di";
     repo = "id";
     rev = "refs/tags/v${version}";
-    hash = "sha256-lmUBy0hJAxfF65RcBP7tTizrg8j2Zypu4sKgOUQCYh8=";
+    hash = "sha256-6Vkbs/i1roAtPGwLxdM+XKDrMTo0+NfVpAUpw6GPg9U=";
   };
 
   build-system = [ flit-core ];
 
-  dependencies = [
-    pydantic
-    requests
-  ];
+  dependencies = [ requests ];
 
   nativeCheckInputs = [
     pretend

From 411d15dc68efe762249f2f8bf97a7ff6c990652b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 7 Dec 2024 00:37:19 +0100
Subject: [PATCH 36/45] python312Packages.weconnect: 0.60.5 -> 0.60.6

Diff: https://github.com/tillsteinbach/WeConnect-python/compare/refs/tags/v0.60.5...v0.60.6

Changelog: https://github.com/tillsteinbach/WeConnect-python/releases/tag/v0.60.6
---
 pkgs/development/python-modules/weconnect/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix
index 109457308110..8494688eaefe 100644
--- a/pkgs/development/python-modules/weconnect/default.nix
+++ b/pkgs/development/python-modules/weconnect/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "weconnect";
-  version = "0.60.5";
+  version = "0.60.6";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "tillsteinbach";
     repo = "WeConnect-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-vWnqitYGh68PM9IM2qKJG3g0JrVfIA+s9Ngh8jpNJKg=";
+    hash = "sha256-sSO+e6pZj7pkkfWF2z5THaD6MrPBX7f1M3nRIoqRC2s=";
   };
 
   postPatch = ''

From 0631a11eede0340af3f3654c96fc441493f6dbef Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 7 Dec 2024 01:08:20 +0100
Subject: [PATCH 37/45] python312Packages.pylamarzocco: 1.2.11 -> 1.3.2

Diff: https://github.com/zweckj/pylamarzocco/compare/refs/tags/v1.2.11...v1.3.2

Changelog: https://github.com/zweckj/pylamarzocco/releases/tag/v1.3.2
---
 .../python-modules/pylamarzocco/default.nix      | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/pylamarzocco/default.nix b/pkgs/development/python-modules/pylamarzocco/default.nix
index c749212aa0b9..d3196bb45b64 100644
--- a/pkgs/development/python-modules/pylamarzocco/default.nix
+++ b/pkgs/development/python-modules/pylamarzocco/default.nix
@@ -1,21 +1,20 @@
 {
   lib,
-  authlib,
+  aiohttp,
+  aioresponses,
   bleak,
   buildPythonPackage,
   fetchFromGitHub,
-  httpx,
   pytest-asyncio,
   pytestCheckHook,
   pythonOlder,
   setuptools,
   syrupy,
-  websockets,
 }:
 
 buildPythonPackage rec {
   pname = "pylamarzocco";
-  version = "1.2.11";
+  version = "1.3.2";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -24,25 +23,24 @@ buildPythonPackage rec {
     owner = "zweckj";
     repo = "pylamarzocco";
     rev = "refs/tags/v${version}";
-    hash = "sha256-iRxn4xAP5b/2byeWbYm6mQwAu1TUmJgOVEqm/bZT9Xw=";
+    hash = "sha256-ngTVm1tfs42pXGIQh8Hy8d7UY3D/skCZkbKr6AACYH0=";
   };
 
   build-system = [ setuptools ];
 
   dependencies = [
-    authlib
+    aiohttp
     bleak
-    httpx
-    websockets
   ];
 
   nativeCheckInputs = [
+    aioresponses
     pytest-asyncio
     pytestCheckHook
     syrupy
   ];
 
-  pythonImportsCheck = [ "lmcloud" ];
+  pythonImportsCheck = [ "pylamarzocco" ];
 
   meta = with lib; {
     description = "Library to interface with La Marzocco's cloud";

From 30a17658ac99c5825fed38ceb4205678df9c2477 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 7 Dec 2024 01:19:14 +0100
Subject: [PATCH 38/45] python312Packages.mypy-boto3-s3: 1.35.74 -> 1.35.76

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index e2b1c53c9607..16d1e163da33 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1162,8 +1162,8 @@ rec {
       "sha256-RwPNNFntNChLqbr86wd1bwp6OqWvs3oj3V+4X71J3Hw=";
 
   mypy-boto3-s3 =
-    buildMypyBoto3Package "s3" "1.35.74"
-      "sha256-HmYmu4JNqjFaFLVif0aEbV5T9Wq8SYDNtm49S0lQyCo=";
+    buildMypyBoto3Package "s3" "1.35.76"
+      "sha256-bPHwNJhf5hB1TD5u8odJBimHDVCK2hO31h57mq60YQg=";
 
   mypy-boto3-s3control =
     buildMypyBoto3Package "s3control" "1.35.73"

From f0ca7ba5581e0ea64d5a967d71114ce064f919bb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 7 Dec 2024 01:24:45 +0100
Subject: [PATCH 39/45] python312Packages.securesystemslib: 1.1.0 -> 1.2.0

Diff: https://github.com/secure-systems-lab/securesystemslib/compare/refs/tags/v1.1.0...v1.2.0

Changelog: https://github.com/secure-systems-lab/securesystemslib/blob/v1.2.0/CHANGELOG.md
---
 pkgs/development/python-modules/securesystemslib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/securesystemslib/default.nix b/pkgs/development/python-modules/securesystemslib/default.nix
index 7d1e431334bf..d4b29be0ffb4 100644
--- a/pkgs/development/python-modules/securesystemslib/default.nix
+++ b/pkgs/development/python-modules/securesystemslib/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "securesystemslib";
-  version = "1.1.0";
+  version = "1.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "secure-systems-lab";
     repo = "securesystemslib";
     rev = "refs/tags/v${version}";
-    hash = "sha256-PDivKunqQcGnER4eyWtGE5gvbqvhavXF7n/O2rTFTkI=";
+    hash = "sha256-HAYsmsW5GKLmfq9FVVsME+tE7Qg0jx9YIWw1UQWwV2c=";
   };
 
   build-system = [ hatchling ];

From b79e67eb6440063ea2672f37de8b5ff58d6ab5c8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 21 Nov 2024 09:24:38 +0100
Subject: [PATCH 40/45] python312Packages.sigstore-rekor-types: 0.0.13 ->
 0.0.17

Diff: https://github.com/trailofbits/sigstore-rekor-types/compare/refs/tags/v0.0.13...v0.0.17

Changelog: https://github.com/trailofbits/sigstore-rekor-types/releases/tag/v0.0.17
---
 .../python-modules/sigstore-rekor-types/default.nix       | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/sigstore-rekor-types/default.nix b/pkgs/development/python-modules/sigstore-rekor-types/default.nix
index 9aafd726976e..f29379975ae9 100644
--- a/pkgs/development/python-modules/sigstore-rekor-types/default.nix
+++ b/pkgs/development/python-modules/sigstore-rekor-types/default.nix
@@ -2,14 +2,14 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  flit-core,
   pydantic,
   pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "sigstore-rekor-types";
-  version = "0.0.13";
+  version = "0.0.17";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,10 +18,10 @@ buildPythonPackage rec {
     owner = "trailofbits";
     repo = "sigstore-rekor-types";
     rev = "refs/tags/v${version}";
-    hash = "sha256-vZNzNu0Ks0Xp/v406jVqPV9FuHgXORMa7NzmXeWoa+Q=";
+    hash = "sha256-mMjFmUjaYvfFCTAvhr4x8QJZSypGTkOmzP+OiVyyz5Y=";
   };
 
-  build-system = [ flit-core ];
+  build-system = [ setuptools ];
 
   dependencies = [ pydantic ] ++ pydantic.optional-dependencies.email;
 

From e889fb97d0642803dcd24e0307e08eeabd4bd61a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 7 Dec 2024 01:37:07 +0100
Subject: [PATCH 41/45] python312Packages.sigstore: 3.5.1 -> 3.5.3

Diff: https://github.com/sigstore/sigstore-python/compare/refs/tags/v3.5.3...v3.5.3

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

diff --git a/pkgs/development/python-modules/sigstore/default.nix b/pkgs/development/python-modules/sigstore/default.nix
index 88ad6bb5d2f4..99b9674dbb7e 100644
--- a/pkgs/development/python-modules/sigstore/default.nix
+++ b/pkgs/development/python-modules/sigstore/default.nix
@@ -27,7 +27,7 @@
 
 buildPythonPackage rec {
   pname = "sigstore-python";
-  version = "3.5.1";
+  version = "3.5.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -36,9 +36,11 @@ buildPythonPackage rec {
     owner = "sigstore";
     repo = "sigstore-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-AMKe+R1sTXdxFAelJmRiEyDNe+T55KaGK3HUARqz3Tw=";
+    hash = "sha256-pAzS/LU5me3qoJo6EmuSFPDO/lqRDKIl5hjFiysWTdM=";
   };
 
+  pythonRelaxDeps = [ "sigstore-rekor-types" ];
+
   build-system = [ flit-core ];
 
   dependencies = [

From 3e191c86b4b0c3e28a75dc2e486432f8c5af9790 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 00:42:36 +0000
Subject: [PATCH 42/45] mint-l-theme: 1.9.8 -> 1.9.9

---
 pkgs/by-name/mi/mint-l-theme/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mi/mint-l-theme/package.nix b/pkgs/by-name/mi/mint-l-theme/package.nix
index 214ebb999785..b0836d514e2e 100644
--- a/pkgs/by-name/mi/mint-l-theme/package.nix
+++ b/pkgs/by-name/mi/mint-l-theme/package.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "mint-l-theme";
-  version = "1.9.8";
+  version = "1.9.9";
 
   src = fetchFromGitHub {
     owner = "linuxmint";
     repo = pname;
     rev = version;
-    hash = "sha256-Jql4NJ8jugy0wi5yT+/Mr5fwxLog37w0VvHhxyMvMlk=";
+    hash = "sha256-umY14seqUjNugN6+wzMDIGbCiis/InseDwVR85PqrGs=";
   };
 
   nativeBuildInputs = [

From 5d45a500ce076535b4d5341f16c6a43b3c6c5a15 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 00:49:17 +0000
Subject: [PATCH 43/45] qtscrcpy: 2.2.1 -> 3.0.0

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

diff --git a/pkgs/by-name/qt/qtscrcpy/package.nix b/pkgs/by-name/qt/qtscrcpy/package.nix
index 3d9d733de46d..55790a81a51f 100644
--- a/pkgs/by-name/qt/qtscrcpy/package.nix
+++ b/pkgs/by-name/qt/qtscrcpy/package.nix
@@ -14,14 +14,14 @@
 
 stdenv.mkDerivation rec {
   pname = "qtscrcpy";
-  version = "2.2.1";
+  version = "3.0.0";
 
   src =
     (fetchFromGitHub {
       owner = "barry-ran";
       repo = "QtScrcpy";
       rev = "refs/tags/v${version}";
-      hash = "sha256-PL/UvRNqvLaFuvSHbkJsaJ2nqRp5+ERM+rmlKVtbShk=";
+      hash = "sha256-RW+7aHcxFEO4H9SVKfAfuwY0IXwThxM29oVS5zhWbpY=";
       fetchSubmodules = true;
     }).overrideAttrs
       (_: {

From 3b33901cff7b9aa5ba14100f09ec36628a4ae25a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 7 Dec 2024 00:05:54 +0000
Subject: [PATCH 44/45] terraform-providers.archive: 2.6.0 -> 2.7.0

---
 .../networking/cluster/terraform-providers/providers.json   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 7cb96fefb515..eec438606279 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -63,13 +63,13 @@
     "vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0="
   },
   "archive": {
-    "hash": "sha256-Xm9BT8O18aTIa1h166dElYaTq4PlC4u7TgFgCfcC6jI=",
+    "hash": "sha256-q2Ougw8U6kapeGWBLhsvrRMW8/kGhE0eTV35kPHrN5g=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/archive",
     "owner": "hashicorp",
     "repo": "terraform-provider-archive",
-    "rev": "v2.6.0",
+    "rev": "v2.7.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-b8yGtOUZezGRgURXigv8ySaxxHN/vCCDPgoDC5EBlok="
+    "vendorHash": "sha256-51bLi7cqy7iUt9Aocog7OOKYWSdGbQEoZzasUpDuHu4="
   },
   "argocd": {
     "hash": "sha256-3a/g1SbgeMWFMNTY/sYrItyE1rRimdNro8nu9wPTf6M=",

From d2428f7e442e2c1d8b2b83f83a823f07c5558dcd Mon Sep 17 00:00:00 2001
From: ben9986 <38633150+Ben9986@users.noreply.github.com>
Date: Sat, 7 Dec 2024 01:43:54 +0000
Subject: [PATCH 45/45] onedrive: patch missed paths

---
 pkgs/by-name/on/onedrive/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/on/onedrive/package.nix b/pkgs/by-name/on/onedrive/package.nix
index 55857333e65e..1e553019ecfc 100644
--- a/pkgs/by-name/on/onedrive/package.nix
+++ b/pkgs/by-name/on/onedrive/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   autoreconfHook,
+  coreutils,
   curl,
   fetchFromGitHub,
   installShellFiles,
@@ -57,6 +58,9 @@ stdenv.mkDerivation (finalAttrs: {
     installShellCompletion --bash --name onedrive contrib/completions/complete.bash
     installShellCompletion --fish --name onedrive contrib/completions/complete.fish
     installShellCompletion --zsh --name _onedrive contrib/completions/complete.zsh
+
+    substituteInPlace $out/lib/systemd/user/onedrive.service --replace-fail "/usr/bin/sleep" "${coreutils}/bin/sleep"
+    substituteInPlace $out/lib/systemd/system/onedrive@.service --replace-fail "/usr/bin/sleep" "${coreutils}/bin/sleep"
   '';
 
   passthru = {